mbirth/LuckyCoinkydink
1
0
Fork 0
Code Issues Pull Requests Activity

Merge pull request #517 from igoltz/Issues_331_516

Browse Source 
add template path as first entry to template_dirs array
This commit is contained in:
onli 2017-06-13 11:09:32 +02:00 committed by GitHub
commit 93c95407aa
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/serendipity_smarty_class.inc.php
View File

@ -121,15 +121,15 @@ class Serendipity_Smarty extends Smarty
$template_engine = serendipity_get_config_var('template_engine'); $template_engine = serendipity_get_config_var('template_engine');
$template_dirs = array(); $template_dirs = array();
// first add template path
$template_dirs[] = $serendipity['serendipityPath'] . $serendipity['templatePath'] . $serendipity['template'];
// then fallback engines (which should never be a comma separated list)
if ($template_engine) { if ($template_engine) {
$p = explode(',', $template_engine); $p = explode(',', $template_engine);
foreach($p AS $te) { foreach($p AS $te) {
$template_dirs[] = $serendipity['serendipityPath'] . $serendipity['templatePath'] . trim($te) . '/'; $template_dirs[] = $serendipity['serendipityPath'] . $serendipity['templatePath'] . trim($te) . '/';
} }
} else {
// this is tested without need actually, but it makes the directory setter fallback chain a little more precise
$template_dirs[] = $serendipity['serendipityPath'] . $serendipity['templatePath'] . $serendipity['template'];
} }
$template_dirs[] = $serendipity['serendipityPath'] . $serendipity['templatePath'] . $serendipity['defaultTemplate']; $template_dirs[] = $serendipity['serendipityPath'] . $serendipity['templatePath'] . $serendipity['defaultTemplate'];
$template_dirs[] = $serendipity['serendipityPath'] . $serendipity['templatePath'] . $serendipity['template_backend']; $template_dirs[] = $serendipity['serendipityPath'] . $serendipity['templatePath'] . $serendipity['template_backend'];