summaryrefslogtreecommitdiff
path: root/lib/tpl/index.php
diff options
context:
space:
mode:
authorlisps <stummp@loewen.de>2014-09-26 12:48:02 +0200
committerlisps <stummp@loewen.de>2014-09-26 12:48:02 +0200
commit8d39e80d363eda2ef31dac8473bfdab4b9cd7ce5 (patch)
tree7bab1caccbc0de7c30f0e610d1e5ee9b3c67d564 /lib/tpl/index.php
parent115aab0f5fca76360c50f759f587229ff327105d (diff)
parent7b950f2d59050052c1d9251b0bd9bd40c7441040 (diff)
downloadrpg-8d39e80d363eda2ef31dac8473bfdab4b9cd7ce5.tar.gz
rpg-8d39e80d363eda2ef31dac8473bfdab4b9cd7ce5.tar.bz2
Merge remote-tracking branch master into revisions
Diffstat (limited to 'lib/tpl/index.php')
-rw-r--r--lib/tpl/index.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/tpl/index.php b/lib/tpl/index.php
index 3c00ab8e8..558f262a7 100644
--- a/lib/tpl/index.php
+++ b/lib/tpl/index.php
@@ -46,7 +46,7 @@ require_once(DOKU_INC.'inc/init.php');
// get merged style.ini
define('SIMPLE_TEST', true); // hack to prevent css output and headers
require_once(DOKU_INC.'lib/exe/css.php');
-$ini = css_styleini(tpl_incdir());
+$ini = css_styleini($conf['template']);
if ($ini) {
echo '<table>';