aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorZotSocial Admin <zotsocial@dm42.net>2018-10-12 19:14:20 +0000
committerMario <mario@mariovavti.com>2018-10-13 14:01:43 +0200
commit321b2b9b49e7c4412906e56ffdcc1be4bf8441be (patch)
tree679d9abab645f8d1ce974b95f90e7387d259b3cd /include
parentf7834547744d232091b966b24b9d2e95bda97681 (diff)
downloadvolse-hubzilla-321b2b9b49e7c4412906e56ffdcc1be4bf8441be.tar.gz
volse-hubzilla-321b2b9b49e7c4412906e56ffdcc1be4bf8441be.tar.bz2
volse-hubzilla-321b2b9b49e7c4412906e56ffdcc1be4bf8441be.zip
Fix order of assignment and get template file before return
(cherry picked from commit 8ebcc4439b373e2127ac33c79e254bc53e8d9070)
Diffstat (limited to 'include')
-rwxr-xr-xinclude/plugin.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/plugin.php b/include/plugin.php
index ce081401d..7a63cbfc1 100755
--- a/include/plugin.php
+++ b/include/plugin.php
@@ -1067,10 +1067,11 @@ function get_markup_template($s, $root = '') {
} else {
if (isset(\App::$override_markup_templates[$testroot][$s]["root"]) &&
isset(\App::$override_markup_templates[$testroot][$s]["file"])) {
- $s = \App::$override_markup_templates[$testroot][$s]["file"];
$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) {
- $newroot = \App::$override_templateroot.$root;
+ $newroot = \App::$override_templateroot . $root;
if ($newroot != '' && substr($newroot,-1) != '/' ) {
$newroot .= '/';
}