summaryrefslogtreecommitdiff
path: root/_test/core
diff options
context:
space:
mode:
authorGerrit Uitslag <klapinklapin@gmail.com>2014-02-15 15:10:15 +0100
committerGerrit Uitslag <klapinklapin@gmail.com>2014-02-15 15:10:15 +0100
commit2643fc174cfce2c89b096e1aa28b8433c1bd9088 (patch)
tree4219fa16c1e196fca55429092494051eb899891c /_test/core
parent1da8dc976a4e9184fe550789a77d8e5cb866926f (diff)
parent0ba750c06b51626ccace39f0f6be7062eebb0a40 (diff)
downloadrpg-2643fc174cfce2c89b096e1aa28b8433c1bd9088.tar.gz
rpg-2643fc174cfce2c89b096e1aa28b8433c1bd9088.tar.bz2
Merge remote-tracking branch 'origin/master' into diff_navigation
Diffstat (limited to '_test/core')
-rw-r--r--_test/core/TestRequest.php9
1 files changed, 8 insertions, 1 deletions
diff --git a/_test/core/TestRequest.php b/_test/core/TestRequest.php
index 0a54910ed..060e37d28 100644
--- a/_test/core/TestRequest.php
+++ b/_test/core/TestRequest.php
@@ -44,13 +44,18 @@ class TestRequest {
* @return TestResponse the resulting output of the request
*/
public function execute($uri='/doku.php') {
+ global $INPUT;
+ global $ID;
+ global $INFO;
+
// save old environment
$server = $_SERVER;
$session = $_SESSION;
$get = $_GET;
$post = $_POST;
$request = $_REQUEST;
-
+ $input = $INPUT;
+
// prepare the right URI
$this->setUri($uri);
@@ -74,6 +79,7 @@ class TestRequest {
// now execute dokuwiki and grep the output
header_remove();
ob_start('ob_start_callback');
+ $INPUT = new Input();
include(DOKU_INC.$this->script);
ob_end_flush();
@@ -89,6 +95,7 @@ class TestRequest {
$_GET = $get;
$_POST = $post;
$_REQUEST = $request;
+ $INPUT = $input;
return $response;
}