harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bypass replace_macros and use template processor directly for theme includes

Browse Source
This commit is contained in:
friendica 2012-12-28 17:28:49 -08:00
parent dda4d689bb
commit ddd58e6e28
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/plugin.php
View File

@ -475,6 +475,8 @@ function format_js_if_exists($source) {
function theme_include($file) { function theme_include($file) {
global $t; // use builtin template processor
$paths = array( $paths = array(
'view/theme/$theme/$ext/$file', 'view/theme/$theme/$ext/$file',
'view/theme/$theme/$file', 'view/theme/$theme/$file',
@ -492,7 +494,7 @@ function theme_include($file) {
$parent = 'NOPATH'; $parent = 'NOPATH';
foreach($paths as $p) { foreach($paths as $p) {
$f = replace_macros($p,array( $f = $t->replace($p,array(
'$theme' => current_theme(), '$theme' => current_theme(),
'$ext' => substr($file,strrpos($file,'.')+1), '$ext' => substr($file,strrpos($file,'.')+1),
'$parent' => $parent, '$parent' => $parent,

2
version.inc
View File

@ -1 +1 @@
2012-12-27.182 2012-12-28.183