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

Fix order of assignment and get template file before return

Browse Source 
(cherry picked from commit 8ebcc4439b)
This commit is contained in:
ZotSocial Admin 2018-10-12 19:14:20 +00:00 committed by Mario
parent f783454774
commit 321b2b9b49
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/plugin.php
View File

@ -1067,10 +1067,11 @@ function get_markup_template($s, $root = '') {
} else { } else {
if (isset(\App::$override_markup_templates[$testroot][$s]["root"]) && if (isset(\App::$override_markup_templates[$testroot][$s]["root"]) &&
isset(\App::$override_markup_templates[$testroot][$s]["file"])) { isset(\App::$override_markup_templates[$testroot][$s]["file"])) {
$s = \App::$override_markup_templates[$testroot][$s]["file"];
$root = \App::$override_markup_templates[$testroot][$s]["root"]; $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) { } elseif (\App::$override_templateroot) {
$newroot = \App::$override_templateroot.$root; $newroot = \App::$override_templateroot . $root;
if ($newroot != '' && substr($newroot,-1) != '/' ) { if ($newroot != '' && substr($newroot,-1) != '/' ) {
$newroot .= '/'; $newroot .= '/';
} }