From c440b758a39e2e82b43562c6605a9705d40449b3 Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 18 Oct 2018 07:12:30 +0000 Subject: Merge branch 'dev' into 'dev' Fix template root redirection See merge request hubzilla/core!1343 (cherry picked from commit e9471124c00a41bcdd3abe7f1d858b51e5209ca3) 442d1cb4 Fix template root redirection --- include/plugin.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/plugin.php b/include/plugin.php index 7a63cbfc1..8ceb6417e 100755 --- a/include/plugin.php +++ b/include/plugin.php @@ -1071,10 +1071,11 @@ function get_markup_template($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; if ($newroot != '' && substr($newroot,-1) != '/' ) { $newroot .= '/'; } + $newroot .= $root; $template = $t->get_markup_template($s, $newroot); } else { $template = $t->get_markup_template($s, $root); -- cgit v1.2.3