diff options
| author | ZotSocial Admin <zotsocial@dm42.net> | 2018-10-12 15:14:20 -0400 |
|---|---|---|
| committer | DM42.Net (Matt Dent) <dentm42@dm42.net> | 2018-10-12 15:20:57 -0400 |
| commit | 8ebcc4439b373e2127ac33c79e254bc53e8d9070 (patch) | |
| tree | 01e08690b1fb06a9941573e6ba1c4057ac2c6701 /include/plugin.php | |
| parent | 81d9258e800e98012bcc68791976e5f12246750f (diff) | |
| download | volse-hubzilla-8ebcc4439b373e2127ac33c79e254bc53e8d9070.tar.gz volse-hubzilla-8ebcc4439b373e2127ac33c79e254bc53e8d9070.tar.bz2 volse-hubzilla-8ebcc4439b373e2127ac33c79e254bc53e8d9070.zip | |
Fix order of assignment and get template file before return
Diffstat (limited to 'include/plugin.php')
| -rwxr-xr-x | include/plugin.php | 5 |
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 .= '/'; } |