From 96a947fc7ad2ac5e966c2e65cc3c44642e22148f Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Thu, 2 Jun 2011 00:32:43 +0000 Subject: [PATCH] Revert r88997: fix for bug 93 caused some additional problems. Follow-up to r89191: disable test case for bug 93 as it currently fails (bug left open). --- includes/parser/Preprocessor_DOM.php | 3 --- includes/parser/Preprocessor_Hash.php | 3 --- tests/parser/parserTests.txt | 2 +- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/includes/parser/Preprocessor_DOM.php b/includes/parser/Preprocessor_DOM.php index bb60a34f71..48c234575f 100644 --- a/includes/parser/Preprocessor_DOM.php +++ b/includes/parser/Preprocessor_DOM.php @@ -205,9 +205,6 @@ class Preprocessor_DOM implements Preprocessor { if ( strpos( $text, '' ) !== false && strpos( $text, '' ) !== false ) { $enableOnlyinclude = true; } - } else if ( isset( $this->parser->ot ) && $this->parser->ot['wiki'] ) { - $ignoredTags = array( 'noinclude', '/noinclude', 'onlyinclude', '/onlyinclude', 'includeonly', '/includeonly' ); - $ignoredElements = array(); } else { $ignoredTags = array( 'noinclude', '/noinclude', 'onlyinclude', '/onlyinclude' ); $ignoredElements = array( 'includeonly' ); diff --git a/includes/parser/Preprocessor_Hash.php b/includes/parser/Preprocessor_Hash.php index 3078e430bf..c2d7d3d8de 100644 --- a/includes/parser/Preprocessor_Hash.php +++ b/includes/parser/Preprocessor_Hash.php @@ -148,9 +148,6 @@ class Preprocessor_Hash implements Preprocessor { if ( strpos( $text, '' ) !== false && strpos( $text, '' ) !== false ) { $enableOnlyinclude = true; } - } else if ( $this->parser->ot['wiki'] ) { - $ignoredTags = array( 'noinclude', '/noinclude', 'onlyinclude', '/onlyinclude', 'includeonly', '/includeonly' ); - $ignoredElements = array(); } else { $ignoredTags = array( 'noinclude', '/noinclude', 'onlyinclude', '/onlyinclude' ); $ignoredElements = array( 'includeonly' ); diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt index 94cb98bf3e..d7d9a26413 100644 --- a/tests/parser/parserTests.txt +++ b/tests/parser/parserTests.txt @@ -3878,7 +3878,7 @@ pst !! test pre-save transform: Signature expansion in nowiki tags (bug 93) !! options -pst +pst disabled !! input Shall not expand: -- 2.20.1