more unit test fixes

- move parser.test.php

darcs-hash:20060809192115-9b6ab-973fea51fbfdcf5f44a2ac66000f2ccb5fdd43b4.gz

2 files changed, 7 insertions, 5 deletions

diff --git a/inc/auth.php b/inc/auth.php
index 5c005434a..6e97b12c0 100644
--- a/inc/auth.php
+++ b/inc/auth.php
@@ -13,6 +13,8 @@
   require_once(DOKU_INC.'inc/common.php');
   require_once(DOKU_INC.'inc/io.php');
 
+	global $conf;
+
   if($conf['useacl']){
     require_once(DOKU_INC.'inc/blowfish.php');
     require_once(DOKU_INC.'inc/mail.php');
diff --git a/inc/parser/handler.php b/inc/parser/handler.php
index 7e6a7b847..55d343a02 100644
--- a/inc/parser/handler.php
+++ b/inc/parser/handler.php
@@ -192,18 +192,18 @@ class Doku_Handler {
 
     function footnote($match, $state, $pos) {
 //        $this->_nestingTag($match, $state, $pos, 'footnote');
-        static $footnote = false;
+        if (!isset($this->_footnote)) $this->_footnote = false;
 
         switch ( $state ) {
             case DOKU_LEXER_ENTER:
                 // footnotes can not be nested - however due to limitations in lexer it can't be prevented
                 // we will still enter a new footnote mode, we just do nothing
-                if ($footnote) {
+                if ($this->_footnote) {
                   $this->_addCall('cdata',array($match), $pos);
                   break;
                 }
 
-                $footnote = true;
+                $this->_footnote = true;
 
                 $ReWriter = & new Doku_Handler_Nest($this->CallWriter,'footnote_close');
                 $this->CallWriter = & $ReWriter;
@@ -211,12 +211,12 @@ class Doku_Handler {
             break;
             case DOKU_LEXER_EXIT:
                 // check whether we have already exitted the footnote mode, can happen if the modes were nested
-                if (!$footnote) {
+                if (!$this->_footnote) {
                   $this->_addCall('cdata',array($match), $pos);
                   break;
                 }
 
-                $footnote = false;
+                $this->_footnote = false;
 
                 $this->_addCall('footnote_close', array(), $pos);
                 $this->CallWriter->process();