diff options
| author | Adrian Lang <lang@cosmocode.de> | 2010-03-15 12:16:23 +0100 |
|---|---|---|
| committer | Adrian Lang <lang@cosmocode.de> | 2010-03-15 12:17:23 +0100 |
| commit | c7cb395c4ee1339709918b7675e91d3d3b10050d (patch) | |
| tree | b36242c05b181aedea81c39802087eddeec2b744 /inc | |
| parent | a958c48cfeaefd8e8c1aeebcd04e9c862f014a6d (diff) | |
| download | rpg-c7cb395c4ee1339709918b7675e91d3d3b10050d.tar.gz rpg-c7cb395c4ee1339709918b7675e91d3d3b10050d.tar.bz2 | |
Load libraries after init
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/init.php | 10 | ||||
| -rw-r--r-- | inc/load.php | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/inc/init.php b/inc/init.php index 7f4792cfa..ae44ad1a9 100644 --- a/inc/init.php +++ b/inc/init.php @@ -40,9 +40,6 @@ if (!defined('DOKU_E_LEVEL')) { error_reporting(DOKU_E_LEVEL); } -// load libraries -require_once(DOKU_INC.'inc/load.php'); - // init memory caches global $cache_revinfo; $cache_revinfo = array(); @@ -249,8 +246,13 @@ init_files(); scriptify(DOKU_CONF.'users.auth'); scriptify(DOKU_CONF.'acl.auth'); +// load libraries +require_once(DOKU_INC.'inc/load.php'); + // setup authentication system -auth_setup(); +if (!defined('NOSESSION')) { + auth_setup(); +} /** * Checks paths from config file diff --git a/inc/load.php b/inc/load.php index dad03875a..796ccec77 100644 --- a/inc/load.php +++ b/inc/load.php @@ -24,9 +24,7 @@ require_once(DOKU_INC.'inc/html.php'); require_once(DOKU_INC.'inc/httputils.php'); require_once(DOKU_INC.'inc/indexer.php'); require_once(DOKU_INC.'inc/infoutils.php'); -require_once(DOKU_INC.'inc/init.php'); require_once(DOKU_INC.'inc/io.php'); -require_once(DOKU_INC.'inc/load.php'); require_once(DOKU_INC.'inc/mail.php'); require_once(DOKU_INC.'inc/media.php'); require_once(DOKU_INC.'inc/pageutils.php'); |