diff options
| author | friendica <info@friendica.com> | 2012-12-28 17:28:49 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-12-28 17:28:49 -0800 |
| commit | ddd58e6e285c6e3dc81beb7f453999e4a93fc069 (patch) | |
| tree | c9f22018508ea63e1b07a850b0c42d37a02c308e | |
| parent | dda4d689bbdd871f5bd8809ce5381aaee5004d5b (diff) | |
| download | volse-hubzilla-ddd58e6e285c6e3dc81beb7f453999e4a93fc069.tar.gz volse-hubzilla-ddd58e6e285c6e3dc81beb7f453999e4a93fc069.tar.bz2 volse-hubzilla-ddd58e6e285c6e3dc81beb7f453999e4a93fc069.zip | |
bypass replace_macros and use template processor directly for theme includes
| -rw-r--r-- | include/plugin.php | 4 | ||||
| -rw-r--r-- | version.inc | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/plugin.php b/include/plugin.php index 46a659ddc..c13a0ff07 100644 --- a/include/plugin.php +++ b/include/plugin.php @@ -475,6 +475,8 @@ function format_js_if_exists($source) { function theme_include($file) { + global $t; // use builtin template processor + $paths = array( 'view/theme/$theme/$ext/$file', 'view/theme/$theme/$file', @@ -492,7 +494,7 @@ function theme_include($file) { $parent = 'NOPATH'; foreach($paths as $p) { - $f = replace_macros($p,array( + $f = $t->replace($p,array( '$theme' => current_theme(), '$ext' => substr($file,strrpos($file,'.')+1), '$parent' => $parent, diff --git a/version.inc b/version.inc index 2851cd0e4..ef8dd5184 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2012-12-27.182 +2012-12-28.183 |