From 03c4aec3c817c51eda2cf5c241f76e3bef585799 Mon Sep 17 00:00:00 2001
From: chris <chris@jalakai.co.uk>
Date: Fri, 4 Aug 2006 16:22:43 +0200
Subject: unittest fixes

darcs-hash:20060804142243-9b6ab-d208f7f1a67a9958fda05c519c8407ad5e733cea.gz
---
 inc/init.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'inc/init.php')

diff --git a/inc/init.php b/inc/init.php
index 934b14dd7..783d3d9c4 100644
--- a/inc/init.php
+++ b/inc/init.php
@@ -25,12 +25,14 @@
 
   //prepare config array()
   global $conf;
-  $conf = array();
+  if (!defined('DOKU_UNITTEST')) {
+    $conf = array();
 
-  // load the config file(s)
-  require_once(DOKU_CONF.'dokuwiki.php');
-  if(@file_exists(DOKU_CONF.'local.php')){
-    require_once(DOKU_CONF.'local.php');
+    // load the config file(s)
+    require_once(DOKU_CONF.'dokuwiki.php');
+    if(@file_exists(DOKU_CONF.'local.php')){
+      require_once(DOKU_CONF.'local.php');
+    }
   }
 
   //prepare language array
-- 
cgit v1.2.3