diff options
| author | chris <chris@jalakai.co.uk> | 2006-08-04 16:22:43 +0200 |
|---|---|---|
| committer | chris <chris@jalakai.co.uk> | 2006-08-04 16:22:43 +0200 |
| commit | 03c4aec3c817c51eda2cf5c241f76e3bef585799 (patch) | |
| tree | df6e92a9b73f0ff360fc3c44c0e0c8426809ee97 /inc/init.php | |
| parent | ac900efc10a9139823163ed90870a7595d726f9f (diff) | |
| download | rpg-03c4aec3c817c51eda2cf5c241f76e3bef585799.tar.gz rpg-03c4aec3c817c51eda2cf5c241f76e3bef585799.tar.bz2 | |
unittest fixes
darcs-hash:20060804142243-9b6ab-d208f7f1a67a9958fda05c519c8407ad5e733cea.gz
Diffstat (limited to 'inc/init.php')
| -rw-r--r-- | inc/init.php | 12 |
1 files changed, 7 insertions, 5 deletions
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 |