Merge branch 'dev' into 'dev'

Add missing else clause

See merge request hubzilla/core!1317
This commit is contained in:
M. Dent 2018-10-07 05:05:27 +02:00
commit 3efeeecace

View File

@ -1075,8 +1075,9 @@ function get_markup_template($s, $root = '') {
$newroot .= '/'; $newroot .= '/';
} }
$template = $t->get_markup_template($s, $newroot); $template = $t->get_markup_template($s, $newroot);
} } else {
$template = $t->get_markup_template($s, $root); $template = $t->get_markup_template($s, $root);
}
return $template; return $template;
} }
} }