From ddd58e6e285c6e3dc81beb7f453999e4a93fc069 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Fri, 28 Dec 2012 17:28:49 -0800
Subject: bypass replace_macros and use template processor directly for theme
 includes

---
 include/plugin.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'include/plugin.php')

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,
-- 
cgit v1.2.3