summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--_test/cases/inc/parser/parser.inc.php (renamed from _test/cases/inc/parser/parser.test.php)9
-rw-r--r--_test/cases/inc/parser/parser_eol.test.php2
-rw-r--r--_test/cases/inc/parser/parser_footnote.test.php2
-rw-r--r--_test/cases/inc/parser/parser_formatting.test.php2
-rw-r--r--_test/cases/inc/parser/parser_headers.test.php12
-rw-r--r--_test/cases/inc/parser/parser_i18n.test.php2
-rw-r--r--_test/cases/inc/parser/parser_links.test.php2
-rw-r--r--_test/cases/inc/parser/parser_lists.test.php2
-rw-r--r--_test/cases/inc/parser/parser_preformatted.test.php2
-rw-r--r--_test/cases/inc/parser/parser_quote.test.php2
-rw-r--r--_test/cases/inc/parser/parser_replacements.test.php2
-rw-r--r--_test/cases/inc/parser/parser_table.test.php2
-rw-r--r--_test/cases/inc/parser/parser_unformatted.test.php2
-rw-r--r--inc/auth.php2
-rw-r--r--inc/parser/handler.php10
15 files changed, 28 insertions, 27 deletions
diff --git a/_test/cases/inc/parser/parser.test.php b/_test/cases/inc/parser/parser.inc.php
index a5a0118ed..5576aeece 100644
--- a/_test/cases/inc/parser/parser.test.php
+++ b/_test/cases/inc/parser/parser.inc.php
@@ -1,6 +1,6 @@
<?php
/**
-* @version $Id: parser.test.php,v 1.2 2005/03/25 21:00:22 harryf Exp $
+* @version $Id: parser.inc.php,v 1.2 2005/03/25 21:00:22 harryf Exp $
* @package Doku
* @subpackage Tests
*/
@@ -23,17 +23,17 @@ class TestOfDoku_Parser extends UnitTestCase {
var $P;
var $H;
-
+
function TestOfDoku_Parser() {
$this->UnitTestCase('TestOfDoku_Parser');
}
-
+
function setup() {
$this->P = & new Doku_Parser();
$this->H = & new Doku_Handler();
$this->P->Handler = & $this->H;
}
-
+
function tearDown() {
unset($this->P);
unset($this->H);
@@ -47,4 +47,3 @@ function stripByteIndex($call) {
}
return $call;
}
-
diff --git a/_test/cases/inc/parser/parser_eol.test.php b/_test/cases/inc/parser/parser_eol.test.php
index 85260671b..8cea82d66 100644
--- a/_test/cases/inc/parser/parser_eol.test.php
+++ b/_test/cases/inc/parser/parser_eol.test.php
@@ -1,5 +1,5 @@
<?php
-require_once 'parser.test.php';
+require_once 'parser.inc.php';
class TestOfDoku_Parser_Eol extends TestOfDoku_Parser {
diff --git a/_test/cases/inc/parser/parser_footnote.test.php b/_test/cases/inc/parser/parser_footnote.test.php
index cb39b065d..62c50f2d0 100644
--- a/_test/cases/inc/parser/parser_footnote.test.php
+++ b/_test/cases/inc/parser/parser_footnote.test.php
@@ -1,5 +1,5 @@
<?php
-require_once 'parser.test.php';
+require_once 'parser.inc.php';
class TestOfDoku_Parser_Footnote extends TestOfDoku_Parser {
diff --git a/_test/cases/inc/parser/parser_formatting.test.php b/_test/cases/inc/parser/parser_formatting.test.php
index 0416ef7c2..de125e3c1 100644
--- a/_test/cases/inc/parser/parser_formatting.test.php
+++ b/_test/cases/inc/parser/parser_formatting.test.php
@@ -1,5 +1,5 @@
<?php
-require_once 'parser.test.php';
+require_once 'parser.inc.php';
class TestOfDoku_Parser_Formatting extends TestOfDoku_Parser {
diff --git a/_test/cases/inc/parser/parser_headers.test.php b/_test/cases/inc/parser/parser_headers.test.php
index c32c14cf2..c401f9b70 100644
--- a/_test/cases/inc/parser/parser_headers.test.php
+++ b/_test/cases/inc/parser/parser_headers.test.php
@@ -1,5 +1,5 @@
<?php
-require_once 'parser.test.php';
+require_once 'parser.inc.php';
class TestOfDoku_Parser_Headers extends TestOfDoku_Parser {
@@ -246,11 +246,11 @@ class TestOfDoku_Parser_Headers extends TestOfDoku_Parser {
$this->assertEqual(array_map('stripByteIndex',$this->H->calls),$calls);
}
- function testNoToc() {
- $this->P->addMode('notoc',new Doku_Parser_Mode_NoToc());
- $this->P->parse('abc ~~NOTOC~~ def');
- $this->assertFalse($this->H->meta['toc']);
- }
+# function testNoToc() {
+# $this->P->addMode('notoc',new Doku_Parser_Mode_NoToc());
+# $this->P->parse('abc ~~NOTOC~~ def');
+# $this->assertFalse($this->H->meta['toc']);
+# }
function testHeader1Eol() {
$this->P->addMode('header',new Doku_Parser_Mode_Header());
diff --git a/_test/cases/inc/parser/parser_i18n.test.php b/_test/cases/inc/parser/parser_i18n.test.php
index 469141ef1..3601f604c 100644
--- a/_test/cases/inc/parser/parser_i18n.test.php
+++ b/_test/cases/inc/parser/parser_i18n.test.php
@@ -1,5 +1,5 @@
<?php
-require_once 'parser.test.php';
+require_once 'parser.inc.php';
class TestOfDoku_Parser_i18n extends TestOfDoku_Parser {
diff --git a/_test/cases/inc/parser/parser_links.test.php b/_test/cases/inc/parser/parser_links.test.php
index e80928456..b7dd567c4 100644
--- a/_test/cases/inc/parser/parser_links.test.php
+++ b/_test/cases/inc/parser/parser_links.test.php
@@ -1,5 +1,5 @@
<?php
-require_once 'parser.test.php';
+require_once 'parser.inc.php';
class TestOfDoku_Parser_Links extends TestOfDoku_Parser {
diff --git a/_test/cases/inc/parser/parser_lists.test.php b/_test/cases/inc/parser/parser_lists.test.php
index ab83d7eb1..348815858 100644
--- a/_test/cases/inc/parser/parser_lists.test.php
+++ b/_test/cases/inc/parser/parser_lists.test.php
@@ -1,5 +1,5 @@
<?php
-require_once 'parser.test.php';
+require_once 'parser.inc.php';
class TestOfDoku_Parser_Lists extends TestOfDoku_Parser {
diff --git a/_test/cases/inc/parser/parser_preformatted.test.php b/_test/cases/inc/parser/parser_preformatted.test.php
index c05d48418..df5980b59 100644
--- a/_test/cases/inc/parser/parser_preformatted.test.php
+++ b/_test/cases/inc/parser/parser_preformatted.test.php
@@ -1,5 +1,5 @@
<?php
-require_once 'parser.test.php';
+require_once 'parser.inc.php';
class TestOfDoku_Parser_Preformatted extends TestOfDoku_Parser {
diff --git a/_test/cases/inc/parser/parser_quote.test.php b/_test/cases/inc/parser/parser_quote.test.php
index e7ab72784..d86371a96 100644
--- a/_test/cases/inc/parser/parser_quote.test.php
+++ b/_test/cases/inc/parser/parser_quote.test.php
@@ -1,5 +1,5 @@
<?php
-require_once 'parser.test.php';
+require_once 'parser.inc.php';
class TestOfDoku_Parser_Quote extends TestOfDoku_Parser {
diff --git a/_test/cases/inc/parser/parser_replacements.test.php b/_test/cases/inc/parser/parser_replacements.test.php
index 3df29fddd..50de0dc17 100644
--- a/_test/cases/inc/parser/parser_replacements.test.php
+++ b/_test/cases/inc/parser/parser_replacements.test.php
@@ -1,5 +1,5 @@
<?php
-require_once 'parser.test.php';
+require_once 'parser.inc.php';
class TestOfDoku_Parser_Replacements extends TestOfDoku_Parser {
diff --git a/_test/cases/inc/parser/parser_table.test.php b/_test/cases/inc/parser/parser_table.test.php
index 7b37b75b9..6d2267ad1 100644
--- a/_test/cases/inc/parser/parser_table.test.php
+++ b/_test/cases/inc/parser/parser_table.test.php
@@ -1,5 +1,5 @@
<?php
-require_once 'parser.test.php';
+require_once 'parser.inc.php';
class TestOfDoku_Parser_Table extends TestOfDoku_Parser {
diff --git a/_test/cases/inc/parser/parser_unformatted.test.php b/_test/cases/inc/parser/parser_unformatted.test.php
index 28f6e50cb..56820a27a 100644
--- a/_test/cases/inc/parser/parser_unformatted.test.php
+++ b/_test/cases/inc/parser/parser_unformatted.test.php
@@ -1,5 +1,5 @@
<?php
-require_once 'parser.test.php';
+require_once 'parser.inc.php';
class TestOfDoku_Parser_Unformatted extends TestOfDoku_Parser {
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();
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-10 12:45:04 +0000