From 4f7083212993bf72f0b8969e6d57f587faaa5dfc Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Thu, 20 Dec 2012 17:47:39 +0100
Subject: Remove global $Indexer, clear index in the testing system instead

---
 _test/core/DokuWikiTest.php | 2 ++
 inc/indexer.php             | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/_test/core/DokuWikiTest.php b/_test/core/DokuWikiTest.php
index b9e151456..91eb5293b 100644
--- a/_test/core/DokuWikiTest.php
+++ b/_test/core/DokuWikiTest.php
@@ -30,6 +30,8 @@ abstract class DokuWikiTest extends PHPUnit_Framework_TestCase {
 
         // remove any leftovers from the last run
         if(is_dir(DOKU_TMP_DATA)){
+            // clear indexer data and cache
+            idx_get_indexer()->clear();
             TestUtils::rdelete(DOKU_TMP_DATA);
         }
 
diff --git a/inc/indexer.php b/inc/indexer.php
index b9eaf31d9..7a62345bf 100644
--- a/inc/indexer.php
+++ b/inc/indexer.php
@@ -1228,7 +1228,7 @@ class Doku_Indexer {
  * @author Tom N Harris <tnharris@whoopdedo.org>
  */
 function idx_get_indexer() {
-    global $Indexer;
+    static $Indexer;
     if (!isset($Indexer)) {
         $Indexer = new Doku_Indexer();
     }
-- 
cgit v1.2.3