Changeset 12427 for trunk/include

Timestamp:

Oct 13, 2011, 8:00:53 PM (13 years ago)

Author:

rvelices

Message:

bug 2469 compiled_template_cache_language option does not work properly on some language keys because of double escaping

File:

• trunk/include/template.class.php (modified) (1 diff)

trunk/include/template.class.php

@@ -767 +767 @@
 
     $regex = "~$ldq *\'([^'$]+)\'\|@translate *$rdq~";
-    $source = preg_replace( $regex.'e', 'isset($lang[\'$1\']) ? $lang[\'$1\'] : \'$0\'', $source);
+    $source = preg_replace_callback( $regex, create_function('$m', 'global $lang; return isset($lang[$m[1]]) ? $lang[$m[1]] : $m[0];'), $source);
 
     $regex = "~$ldq *\'([^'$]+)\'\|@translate\|~";
-    $source = preg_replace( $regex.'e', 'isset($lang[\'$1\']) ? \'{\'.var_export($lang[\'$1\'],true).\'|\' : \'$0\'', $source);
+    $source = preg_replace_callback( $regex, create_function('$m', 'global $lang; return isset($lang[$m[1]]) ? \'{\'.var_export($lang[$m[1]],true).\'|\' : \'$m[0]\';'), $source);
 
     $regex = "~($ldq *assign +var=.+ +value=)\'([^'$]+)\'\|@translate~e";
-    $source = preg_replace( $regex, 'isset($lang[\'$2\']) ? \'$1\'.var_export($lang[\'$2\'],true) : \'$0\'', $source);
+    $source = preg_replace_callback( $regex, create_function('$m', 'global $lang; return isset($lang[$m[2]]) ? $m[1].var_export($lang[$m[2]],true) : \'$m[0]\';'), $source);
 
     return $source;