From 90394abd2d0fc66a994a3f81c76e265d0707b351 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <gohr@cosmocode.de>
Date: Wed, 17 Dec 2014 13:14:02 +0100
Subject: fix global environment during test requests

---
 _test/core/TestRequest.php | 2 --
 doku.php                   | 5 +++++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/_test/core/TestRequest.php b/_test/core/TestRequest.php
index 060e37d28..dad2060e5 100644
--- a/_test/core/TestRequest.php
+++ b/_test/core/TestRequest.php
@@ -45,8 +45,6 @@ class TestRequest {
      */
     public function execute($uri='/doku.php') {
         global $INPUT;
-        global $ID;
-        global $INFO;
 
         // save old environment
         $server = $_SERVER;
diff --git a/doku.php b/doku.php
index 7cb92cffa..f5aa6cfa4 100644
--- a/doku.php
+++ b/doku.php
@@ -15,6 +15,11 @@ $updateVersion = 47;
 
 if(!defined('DOKU_INC')) define('DOKU_INC', dirname(__FILE__).'/');
 
+// define all DokuWiki globals here (needed within test requests but also helps to keep track)
+global  $ACT,  $INPUT, $QUERY, $ID, $REV, $DATE_AT, $IDX,
+        $DATE, $RANGE, $HIGH, $TEXT, $PRE, $SUF, $SUM, $INFO, $JSINFO;
+
+
 if(isset($_SERVER['HTTP_X_DOKUWIKI_DO'])) {
     $ACT = trim(strtolower($_SERVER['HTTP_X_DOKUWIKI_DO']));
 } elseif(!empty($_REQUEST['idx'])) {
-- 
cgit v1.2.3