Author: nathangray
New Revision: 27827
URL: http://www.egroupware.org/viewvc/egroupware?rev=27827&view=rev
Log:
Make etemplate able to handle multiple calls to egw::lang() in the same line
Modified:
trunk/etemplate/inc/class.etemplate.inc.php
Modified: trunk/etemplate/inc/class.etemplate.inc.php
URL: http://www.egroupware.org/viewvc/egroupware/trunk/etemplate/inc/class.etemplate.inc.php?rev=27827&r1=27826&r2=27827&view=diff
— trunk/etemplate/inc/class.etemplate.inc.php (original)
+++ trunk/etemplate/inc/class.etemplate.inc.php Fri Sep 11 22:13:06 2009
@@ -1875,9 +1875,11 @@
$on = str_replace($matches[0],$matches[1],$on);
}
// we need to search ungready (shortest possible match), to avoid catching to much
-
if (preg_match('/egw::lang\(["\']{1}(.*)["\']{1}\)/U',$on,$matches)) { -
$str = lang($matches[1]); -
$on = str_replace($matches[0],'\''.addslashes($str).'\'',$on);
-
if (preg_match_all('/egw::lang\(["\']{1}(.*)["\']{1}\)/U',$on,$matches)) { -
foreach($matches[1] as $n => $string) { -
$str = lang($string); -
$on = str_replace($matches[0][$n],'\''.addslashes($str).'\'',$on); -
} } // inserts the styles of a named template
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what’s new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs