From 233875a1815d69881379bb46b2b4c110664259f3 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Mon, 3 Mar 2008 05:47:12 +0000 Subject: [PATCH] "using ungreeded search for egw::lang()" --- etemplate/inc/class.uietemplate.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etemplate/inc/class.uietemplate.inc.php b/etemplate/inc/class.uietemplate.inc.php index b677bc7e35..28d3f74c5c 100644 --- a/etemplate/inc/class.uietemplate.inc.php +++ b/etemplate/inc/class.uietemplate.inc.php @@ -1855,8 +1855,8 @@ foreach($sess as $key => $val) } $on = str_replace($matches[0],$matches[1],$on); } - - if (preg_match('/egw::lang\(["\']{1}(.*)["\']{1}\)/',$on,$matches)) { + // 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); }