aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorchrisaga <chrisaga@piwigo.org>2006-07-09 18:00:13 +0000
committerchrisaga <chrisaga@piwigo.org>2006-07-09 18:00:13 +0000
commit8078daf5cd99627ada6d47c968f4be37062b4bf6 (patch)
tree66e9ad724d7d83c2410ddc97991d7068d3ab7591 /include
parentfc6777ab6ecdcb7bfeba9fe53cb0dc932b2b2af8 (diff)
merge from trunk r1455:1456 into branch 1.6 (use {pwg_root} in themeconf.inc.php)
git-svn-id: http://piwigo.org/svn/branches/branch-1_6@1457 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include')
-rw-r--r--include/template.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/template.php b/include/template.php
index 5f2cf7a2c..d93700b7a 100644
--- a/include/template.php
+++ b/include/template.php
@@ -328,11 +328,11 @@ class Template {
*/
function compile($code, $do_not_echo = false, $retvar = '')
{
- $code = preg_replace('/\{pwg_root\}/e', "get_root_url()", $code);
// PWG specific : communication between template and $lang
$code = preg_replace('/\{lang:([^}]+)\}/e', "l10n('$1')", $code);
// PWG specific : expand themeconf.inc.php variables
$code = preg_replace('/\{themeconf:([^}]+)\}/e', "get_themeconf('$1')", $code);
+ $code = preg_replace('/\{pwg_root\}/e', "get_root_url()", $code);
// replace \ with \\ and then ' with \'.
$code = str_replace('\\', '\\\\', $code);