Permalink
Browse files

don't load config file from DOKU_INC/conf/ but from DOKU_CONF

(better for farms and anything else using preload.php)
  • Loading branch information...
1 parent d31cef3 commit 849bf37152945d749fb594b6e624e671f4c4e42c @selfthinker committed Jan 16, 2011
Showing with 2 additions and 2 deletions.
  1. +1 −1 action.php
  2. +1 −1 admin.php
View
@@ -114,7 +114,7 @@ function getTpl() {
// get template from namespace/page and config
global $ID;
- $config = DOKU_INC.'conf/loadskin.conf';
+ $config = DOKU_CONF.'loadskin.conf';
if(@file_exists($config)) {
$data = unserialize(io_readFile($config, false));
View
@@ -19,7 +19,7 @@ class admin_plugin_loadskin extends DokuWiki_Admin_Plugin {
*/
function admin_plugin_loadskin() {
$this->setupLocale();
- $this->config = DOKU_INC.'conf/loadskin.conf';
+ $this->config = DOKU_CONF.'loadskin.conf';
}
/**

0 comments on commit 849bf37

Please sign in to comment.