harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into 'dev'

Browse Source 
Fix template root redirection

See merge request hubzilla/core!1343

(cherry picked from commit e9471124c0)

442d1cb4 Fix template root redirection
This commit is contained in:
Mario
2018-10-18 07:12:30 +00:00
parent 5030c55b1e
commit c440b758a3
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/plugin.php
View File

@@ -1071,10 +1071,11 @@ function get_markup_template($s, $root = '') {
$s = \App::$override_markup_templates[$testroot][$s]["file"]; $s = \App::$override_markup_templates[$testroot][$s]["file"];
$template = $t->get_markup_template($s, $root); $template = $t->get_markup_template($s, $root);
} elseif (\App::$override_templateroot) { } elseif (\App::$override_templateroot) {
$newroot = \App::$override_templateroot . $root; $newroot = \App::$override_templateroot;
if ($newroot != '' && substr($newroot,-1) != '/' ) { if ($newroot != '' && substr($newroot,-1) != '/' ) {
$newroot .= '/'; $newroot .= '/';
} }
$newroot .= $root;
$template = $t->get_markup_template($s, $newroot); $template = $t->get_markup_template($s, $newroot);
} else { } else {
$template = $t->get_markup_template($s, $root); $template = $t->get_markup_template($s, $root);