Merge pull request #384 from splitbrain/lang_in_tests

Fix missing values in unittest harness

2 files changed, 9 insertions, 2 deletions

diff --git a/_test/bootstrap.php b/_test/bootstrap.php
index 732fef9ed..3f59db515 100644
--- a/_test/bootstrap.php
+++ b/_test/bootstrap.php
@@ -68,6 +68,13 @@ $default_server_vars = array(
     'REQUEST_TIME' => time(),
 );
 
+// fixup for $_SERVER when run from CLI,
+// some values should be mocked for use by inc/init.php which is called here
+// [ $_SERVER is also mocked in TestRequest::execute() ]
+if (php_sapi_name() == 'cli') {
+  $_SERVER = array_merge($default_server_vars, $_SERVER);
+}
+
 // create temp directories
 mkdir(TMP_DIR);
 
diff --git a/inc/init.php b/inc/init.php
index 30eb1b251..248d27b9c 100644
--- a/inc/init.php
+++ b/inc/init.php
@@ -267,10 +267,10 @@ function init_lang($langCode) {
     $lang = array();
 
     //load the language files
-    require_once(DOKU_INC.'inc/lang/en/lang.php');
+    require(DOKU_INC.'inc/lang/en/lang.php');
     if ($langCode && $langCode != 'en') {
         if (file_exists(DOKU_INC."inc/lang/$langCode/lang.php")) {
-            require_once(DOKU_INC."inc/lang/$langCode/lang.php");
+            require(DOKU_INC."inc/lang/$langCode/lang.php");
         }
     }
 }