aboutsummaryrefslogtreecommitdiffstats
path: root/include/plugin.php
diff options
context:
space:
mode:
authorM.Dent <dentm42@dm42.net>2018-10-17 22:21:31 -0400
committerM.Dent <dentm42@dm42.net>2018-10-17 22:21:31 -0400
commit442d1cb48f0e01baad68b3050f1944a51b1915ae (patch)
tree886cd6ac7200905b076b93abe03ad4de063b4d1c /include/plugin.php
parentfa91e2a60cce1f436b0bec946f4e147bca5752d0 (diff)
downloadvolse-hubzilla-442d1cb48f0e01baad68b3050f1944a51b1915ae.tar.gz
volse-hubzilla-442d1cb48f0e01baad68b3050f1944a51b1915ae.tar.bz2
volse-hubzilla-442d1cb48f0e01baad68b3050f1944a51b1915ae.zip
Fix template root redirection
Diffstat (limited to 'include/plugin.php')
-rwxr-xr-xinclude/plugin.php3
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);