diff options
| author | rvelices <rv-github@modusoptimus.com> | 2011-11-22 21:19:11 +0000 |
|---|---|---|
| committer | rvelices <rv-github@modusoptimus.com> | 2011-11-22 21:19:11 +0000 |
| commit | 8f3ea20466c5976b04e6b921cbc3133254ace01d (patch) | |
| tree | 2ae5d1ab7f9b821d75cc2954ebf33be59decf864 /include | |
| parent | aa87a2583b10dfcd7cd2b0e5bbdd717122778c3f (diff) | |
merge -r12656 from trunk bug 2516: compiled_template_cache_language option does not work properly (again)
git-svn-id: http://piwigo.org/svn/branches/2.3@12657 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include')
| -rw-r--r-- | include/template.class.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/template.class.php b/include/template.class.php index 4147717f4..3542d8b58 100644 --- a/include/template.class.php +++ b/include/template.class.php @@ -769,10 +769,10 @@ var s,after = document.getElementsByTagName(\'script\')[document.getElementsByTa $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_callback( $regex, create_function('$m', 'global $lang; return isset($lang[$m[1]]) ? \'{\'.var_export($lang[$m[1]],true).\'|\' : \'$m[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~"; - $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); + $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; } |