Load libraries after init

dokuwiki · Mar 15, 2010 · c7cb395 · c7cb395
1 parent a958c48
commit c7cb395
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/inc/init.php b/inc/init.php
@@ -40,9 +40,6 @@ function delta_time($start=0) {
     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 @@ function_exists('ob_gzhandler')) {
 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
@@ -24,9 +24,7 @@
 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');