force template fallback

This commit is contained in:
Ian 2015-01-31 12:04:29 +01:00
parent 86f1bf884e
commit bb1cfce826
2 changed files with 10 additions and 2 deletions

View file

@ -1,3 +1,7 @@
4.08 Fix 2.0 backend template chaining
4.07.2 Fix htmlspecialchars for PHP >= 5.4
4.07.1 Fix search with pdo-sqlite
Remove doubled fetchentries-event

View file

@ -91,7 +91,7 @@ class serendipity_event_staticpage extends serendipity_event
$propbag->add('page_configuration', $this->config);
$propbag->add('type_configuration', $this->config_types);
$propbag->add('author', 'Marco Rinck, Garvin Hicking, David Rolston, Falk Doering, Stephan Manske, Pascal Uhlmann, Ian, Don Chambers');
$propbag->add('version', '4.07.2');
$propbag->add('version', '4.08');
$propbag->add('requirements', array(
'serendipity' => '1.3',
'smarty' => '2.6.7',
@ -2550,7 +2550,11 @@ foreach($select AS $select_value => $select_desc) {
$filename = 'default_staticpage_backend.tpl';
}
$tfile = serendipity_getTemplateFile('backend_templates/' . $filename, 'serendipityPath');
if ($serendipity['version'][0] < 2) {
$tfile = serendipity_getTemplateFile('backend_templates/' . $filename, 'serendipityPath'); // old API
} else {
$tfile = serendipity_getTemplateFile('backend_templates/' . $filename, 'serendipityPath', true); // force fallback
}
if (!$tfile || $tfile == 'backend_templates/' . $filename) {
$tfile = serendipity_getTemplateFile($filename, 'serendipityPath');
if (!$tfile || $tfile == $filename) {