diff options
| author | Mario <mario@mariovavti.com> | 2018-10-13 14:01:01 +0200 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2018-10-13 14:01:01 +0200 |
| commit | fb3dd5eee6abbadf8ae5dec8c2145bebadcd68ef (patch) | |
| tree | cfcae365b801a9d2a7377fbff74a834b6399fd5a | |
| parent | e5184458530bb0394e12026c82ee89257115f690 (diff) | |
| parent | 8ebcc4439b373e2127ac33c79e254bc53e8d9070 (diff) | |
| download | volse-hubzilla-fb3dd5eee6abbadf8ae5dec8c2145bebadcd68ef.tar.gz volse-hubzilla-fb3dd5eee6abbadf8ae5dec8c2145bebadcd68ef.tar.bz2 volse-hubzilla-fb3dd5eee6abbadf8ae5dec8c2145bebadcd68ef.zip | |
Merge branch 'dev' into 'dev'
Fix order of assignment and get template file before return
See merge request hubzilla/core!1329
| -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 .= '/'; } |