Skip to content

Commit 744849a

Browse files
committed
Fix Engine: default not leading to default templates being used
1 parent 08f6a0e commit 744849a

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

docs/NEWS

+3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
Version 2.6-alpha1 ()
22
------------------------------------------------------------------------
33

4+
* Fix option to set a different theme as fallback option by setting
5+
Engine: $themename in a themes info.txt
6+
47
* Let installer check for the intl extension, needed for the strftime
58
compatibility library used for PHP 8.1+
69

include/functions_config.inc.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ function serendipity_getTemplateFile($file, $key = 'serendipityHTTPPath', $force
266266
} else {
267267
$directories[] = $serendipity['template_backend'] . '/'; # Since 2.0 s9y can have a independent backend theme
268268
}
269-
$directories[] = $serendipity['template_engine'] ?? null . '/'; # themes can set an engine, which will be used if they do not have the file
269+
$directories[] = ($serendipity['template_engine'] ?? null) . '/'; # themes can set an engine, which will be used if they do not have the file
270270
$directories[] = $serendipity['defaultTemplate'] .'/'; # the default theme is the last place we will look in, serving as pure fallback
271271
$directories = array_unique($directories); # save performance by not checking for file existence multiple times in the same directory
272272

0 commit comments

Comments
 (0)