diff options
| -rw-r--r-- | conf/dokuwiki.php | 6 | ||||
| -rw-r--r-- | inc/init.php | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/conf/dokuwiki.php b/conf/dokuwiki.php index ea29f19e1..c82a7f6f3 100644 --- a/conf/dokuwiki.php +++ b/conf/dokuwiki.php @@ -80,10 +80,4 @@ $conf['ftp']['user'] = 'user'; $conf['ftp']['pass'] = 'password'; $conf['ftp']['root'] = '/home/user/htdocs'; -//this includes a local config file if exist which make upgrading more easy - just don't touch this -if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../').'/'); -@include(DOKU_INC.'conf/local.php'); - -//a small bugfix for some browsers/proxies just don't touch this either -$lang = array(); ?> diff --git a/inc/init.php b/inc/init.php index 334d77b00..46046ab29 100644 --- a/inc/init.php +++ b/inc/init.php @@ -5,7 +5,13 @@ // define the include path if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../').'/'); + + // load the config file(s) require_once(DOKU_INC.'conf/dokuwiki.php'); + @include_once(DOKU_INC.'conf/local.php'); + + //prepare language array + $lang = array(); // define baseURL if(!defined('DOKU_BASE')) define('DOKU_BASE',getBaseURL()); |