diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2005-07-29 17:54:57 +0200 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2005-07-29 17:54:57 +0200 |
| commit | e7cb32dcb57d3ae03544db66367d6aaa02f7ddf8 (patch) | |
| tree | 7d7f82cc8049656bc859ebfc2961d9a2fd2f9918 /inc/init.php | |
| parent | 9f830448ee35b709be3c303585a230dfbf8582b3 (diff) | |
| download | rpg-e7cb32dcb57d3ae03544db66367d6aaa02f7ddf8.tar.gz rpg-e7cb32dcb57d3ae03544db66367d6aaa02f7ddf8.tar.bz2 | |
DOKU_CONF define for config directory #479
darcs-hash:20050729155457-7ad00-94554865259e4cbd6a1c75bb62a93f37304adbf0.gz
Diffstat (limited to 'inc/init.php')
| -rw-r--r-- | inc/init.php | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/inc/init.php b/inc/init.php index 370e308b7..4e59cdbe1 100644 --- a/inc/init.php +++ b/inc/init.php @@ -6,6 +6,9 @@ // define the include path if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../').'/'); + // define config path (packagers may want to change this to /etc/dokuwiki/) + if(!defined('DOKU_CONF')) define('DOKU_CONF',DOKU_INC.'/conf/'); + // set up error reporting to sane values error_reporting(E_ALL ^ E_NOTICE); @@ -14,8 +17,8 @@ $conf = array(); // load the config file(s) - require_once(DOKU_INC.'conf/dokuwiki.php'); - @include_once(DOKU_INC.'conf/local.php'); + require_once(DOKU_CONF.'dokuwiki.php'); + @include_once(DOKU_CONF.'local.php'); //prepare language array global $lang; @@ -70,8 +73,8 @@ init_paths(); // automatic upgrade to script versions of certain files - scriptify(DOKU_INC.'conf/users.auth'); - scriptify(DOKU_INC.'conf/acl.auth'); + scriptify(DOKU_CONF.'users.auth'); + scriptify(DOKU_CONF.'acl.auth'); /** |