From 321b2b9b49e7c4412906e56ffdcc1be4bf8441be Mon Sep 17 00:00:00 2001 From: ZotSocial Admin Date: Fri, 12 Oct 2018 19:14:20 +0000 Subject: Fix order of assignment and get template file before return (cherry picked from commit 8ebcc4439b373e2127ac33c79e254bc53e8d9070) --- include/plugin.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/plugin.php b/include/plugin.php index ce081401d..7a63cbfc1 100755 --- a/include/plugin.php +++ b/include/plugin.php @@ -1067,10 +1067,11 @@ function get_markup_template($s, $root = '') { } else { if (isset(\App::$override_markup_templates[$testroot][$s]["root"]) && isset(\App::$override_markup_templates[$testroot][$s]["file"])) { - $s = \App::$override_markup_templates[$testroot][$s]["file"]; $root = \App::$override_markup_templates[$testroot][$s]["root"]; + $s = \App::$override_markup_templates[$testroot][$s]["file"]; + $template = $t->get_markup_template($s, $root); } elseif (\App::$override_templateroot) { - $newroot = \App::$override_templateroot.$root; + $newroot = \App::$override_templateroot . $root; if ($newroot != '' && substr($newroot,-1) != '/' ) { $newroot .= '/'; } -- cgit v1.2.3