diff options
| author | Guy Brand <gb@unistra.fr> | 2015-08-10 10:03:27 +0200 |
|---|---|---|
| committer | Guy Brand <gb@unistra.fr> | 2015-08-10 10:03:27 +0200 |
| commit | 53a57d16b9c741bb44099fd93bf79efa06796341 (patch) | |
| tree | 24a90a50afe9325926c8ebaa2ed90f9fa093e5b9 /_test/core | |
| parent | cf6e6645c31a9f185cef3fb9452fb188882ede47 (diff) | |
| parent | a060d9973e7c1d5051f2cc426937881826e4972e (diff) | |
| download | rpg-53a57d16b9c741bb44099fd93bf79efa06796341.tar.gz rpg-53a57d16b9c741bb44099fd93bf79efa06796341.tar.bz2 | |
Merge branch master into stable
Diffstat (limited to '_test/core')
| -rw-r--r-- | _test/core/DokuWikiTest.php | 4 | ||||
| -rw-r--r-- | _test/core/TestRequest.php | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/_test/core/DokuWikiTest.php b/_test/core/DokuWikiTest.php index f4521256a..4e40d510a 100644 --- a/_test/core/DokuWikiTest.php +++ b/_test/core/DokuWikiTest.php @@ -54,7 +54,7 @@ abstract class DokuWikiTest extends PHPUnit_Framework_TestCase { foreach (array('default','local','protected') as $config_group) { if (empty($config_cascade['main'][$config_group])) continue; foreach ($config_cascade['main'][$config_group] as $config_file) { - if (@file_exists($config_file)) { + if (file_exists($config_file)) { include($config_file); } } @@ -68,7 +68,7 @@ abstract class DokuWikiTest extends PHPUnit_Framework_TestCase { foreach (array('default','local') as $config_group) { if (empty($config_cascade['license'][$config_group])) continue; foreach ($config_cascade['license'][$config_group] as $config_file) { - if(@file_exists($config_file)){ + if(file_exists($config_file)){ include($config_file); } } 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; |