From c7cb395c4ee1339709918b7675e91d3d3b10050d Mon Sep 17 00:00:00 2001
From: Adrian Lang <lang@cosmocode.de>
Date: Mon, 15 Mar 2010 12:16:23 +0100
Subject: Load libraries after init

---
 inc/init.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'inc/init.php')

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
-- 
cgit v1.2.3