diff options
| author | Anika Henke <anika@selfthinker.org> | 2012-10-11 13:48:09 +0100 |
|---|---|---|
| committer | Anika Henke <anika@selfthinker.org> | 2012-10-11 13:48:09 +0100 |
| commit | f809ae7b68654e512abb3c980f458bda533d1327 (patch) | |
| tree | 6909e6ed6d92cb29e122a88a48cec637ad91cd64 | |
| parent | 0ac69508958a06e566a51fb6a74802401ebe5eb5 (diff) | |
| download | rpg-f809ae7b68654e512abb3c980f458bda533d1327.tar.gz rpg-f809ae7b68654e512abb3c980f458bda533d1327.tar.bz2 | |
fixed lib/tpl/index.php to reflect recent changes
| -rw-r--r-- | lib/tpl/index.php | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/lib/tpl/index.php b/lib/tpl/index.php index 7cdec9774..3c00ab8e8 100644 --- a/lib/tpl/index.php +++ b/lib/tpl/index.php @@ -43,12 +43,10 @@ require_once(DOKU_INC.'inc/init.php'); </head> <body> <?php -$styleini = ''; -if(@file_exists($conf['template'].'/style.local.ini')) - $styleini = $conf['template'].'/style.local.ini'; -else if(@file_exists($conf['template'].'/style.ini')) - $styleini = $conf['template'].'/style.ini'; -$ini = @parse_ini_file($styleini, true); +// 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()); if ($ini) { echo '<table>'; |