Index: /branches/2.3/admin/themes/default/template/install.tpl
===================================================================
--- /branches/2.3/admin/themes/default/template/install.tpl (revision 12427)
+++ /branches/2.3/admin/themes/default/template/install.tpl (revision 12428)
@@ -281,5 +281,5 @@
Index: /branches/2.3/admin/themes/default/template/intro.tpl
===================================================================
--- /branches/2.3/admin/themes/default/template/intro.tpl (revision 12427)
+++ /branches/2.3/admin/themes/default/template/intro.tpl (revision 12428)
@@ -2,6 +2,6 @@
{footer_script require='jquery.cluetip'}
-var piwigo_need_update_msg = '{"A new version of Piwigo is available."|@translate|@escape:"javascript"}';
-var ext_need_update_msg = '{"Some upgrades are available for extensions."|@translate|@escape:"javascript"}';
+var piwigo_need_update_msg = '{'A new version of Piwigo is available.'|@translate|@escape:"javascript"}';
+var ext_need_update_msg = '{'Some upgrades are available for extensions.'|@translate|@escape:"javascript"}';
{literal}
@@ -43,5 +43,5 @@
{'Check for upgrade'|@translate}
{if isset($SUBSCRIBE_BASE_URL)}
- {'Subscribe %s to Piwigo Announcements Newsletter'|@translate|@sprintf:$EMAIL}
+ {'Subscribe %s to Piwigo Announcements Newsletter'|@translate|@sprintf:$EMAIL}
{/if}
Index: /branches/2.3/admin/themes/default/template/languages_new.tpl
===================================================================
--- /branches/2.3/admin/themes/default/template/languages_new.tpl (revision 12427)
+++ /branches/2.3/admin/themes/default/template/languages_new.tpl (revision 12428)
@@ -27,6 +27,6 @@
{foreach from=$languages item=language name=languages_loop}
- {$language.EXT_NAME} |
- {$language.VERSION} |
+ {$language.EXT_NAME} |
+ {$language.VERSION} |
{$language.DATE} |
{$language.AUTHOR} |
Index: /branches/2.3/admin/themes/default/template/menubar.tpl
===================================================================
--- /branches/2.3/admin/themes/default/template/menubar.tpl (revision 12427)
+++ /branches/2.3/admin/themes/default/template/menubar.tpl (revision 12428)
@@ -27,5 +27,5 @@
-
{'Menu Management'|translate}
+ {'Menu Management'|@translate}
Index: /branches/2.3/admin/themes/default/template/updates_ext.tpl
===================================================================
--- /branches/2.3/admin/themes/default/template/updates_ext.tpl (revision 12427)
+++ /branches/2.3/admin/themes/default/template/updates_ext.tpl (revision 12428)
@@ -187,5 +187,5 @@
|
- {$plugin.REV_DESC|htmlspecialchars|nl2br}
+ {$plugin.REV_DESC|@htmlspecialchars|@nl2br}
|
@@ -229,5 +229,5 @@
|
- {$theme.REV_DESC|htmlspecialchars|nl2br}
+ {$theme.REV_DESC|@htmlspecialchars|@nl2br}
|
@@ -271,5 +271,5 @@
|
- {$language.REV_DESC|htmlspecialchars|nl2br}
+ {$language.REV_DESC|@htmlspecialchars|@nl2br}
|
Index: /branches/2.3/include/template.class.php
===================================================================
--- /branches/2.3/include/template.class.php (revision 12427)
+++ /branches/2.3/include/template.class.php (revision 12428)
@@ -767,11 +767,11 @@
$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;