diff options
| author | Gerrit Uitslag <klapinklapin@gmail.com> | 2014-09-28 15:36:21 +0200 |
|---|---|---|
| committer | Gerrit Uitslag <klapinklapin@gmail.com> | 2014-09-28 15:36:21 +0200 |
| commit | 0c1b02bead38d5a58032a1c88cf3ca53bbc4a4d9 (patch) | |
| tree | b9cb574a1964f28dda648795010a5be056b80618 /_test/core/DokuWikiTest.php | |
| parent | 618191d008b98cb421694c541145c863d7b300ce (diff) | |
| parent | da9572711f54d13ce3c5506971154b0bc359723f (diff) | |
| download | rpg-0c1b02bead38d5a58032a1c88cf3ca53bbc4a4d9.tar.gz rpg-0c1b02bead38d5a58032a1c88cf3ca53bbc4a4d9.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into FS#2697searchpagereadonly
Conflicts:
inc/lang/hr/searchpage.txt
inc/lang/ko/searchpage.txt
Diffstat (limited to '_test/core/DokuWikiTest.php')
| -rw-r--r-- | _test/core/DokuWikiTest.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/_test/core/DokuWikiTest.php b/_test/core/DokuWikiTest.php index 91eb5293b..f4521256a 100644 --- a/_test/core/DokuWikiTest.php +++ b/_test/core/DokuWikiTest.php @@ -115,5 +115,8 @@ abstract class DokuWikiTest extends PHPUnit_Framework_TestCase { // reload language $local = $conf['lang']; trigger_event('INIT_LANG_LOAD', $local, 'init_lang', true); + + global $INPUT; + $INPUT = new Input(); } } |