Changeset 1457

Timestamp:

Jul 9, 2006, 8:00:13 PM (18 years ago)

Author:

chrisaga

Message:

merge from trunk r1455:1456 into branch 1.6 (use {pwg_root} in themeconf.inc.php)

File:

• branches/branch-1_6/include/template.php (modified) (1 diff)

branches/branch-1_6/include/template.php

@@ -329 +329 @@
   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 \'.