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

1 files changed, 2 insertions, 1 deletions

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);