http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89308
Revision: 89308
Author: brion
Date: 2011-06-02 00:32:43 +0000 (Thu, 02 Jun 2011)
Log Message:
-----------
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).
Modified Paths:
--------------
trunk/phase3/includes/parser/Preprocessor_DOM.php
trunk/phase3/includes/parser/Preprocessor_Hash.php
trunk/phase3/tests/parser/parserTests.txt
Modified: trunk/phase3/includes/parser/Preprocessor_DOM.php
===================================================================
--- trunk/phase3/includes/parser/Preprocessor_DOM.php 2011-06-02 00:11:38 UTC
(rev 89307)
+++ trunk/phase3/includes/parser/Preprocessor_DOM.php 2011-06-02 00:32:43 UTC
(rev 89308)
@@ -205,9 +205,6 @@
if ( strpos( $text, '<onlyinclude>' ) !== false &&
strpos( $text, '</onlyinclude>' ) !== 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' );
Modified: trunk/phase3/includes/parser/Preprocessor_Hash.php
===================================================================
--- trunk/phase3/includes/parser/Preprocessor_Hash.php 2011-06-02 00:11:38 UTC
(rev 89307)
+++ trunk/phase3/includes/parser/Preprocessor_Hash.php 2011-06-02 00:32:43 UTC
(rev 89308)
@@ -148,9 +148,6 @@
if ( strpos( $text, '<onlyinclude>' ) !== false &&
strpos( $text, '</onlyinclude>' ) !== 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' );
Modified: trunk/phase3/tests/parser/parserTests.txt
===================================================================
--- trunk/phase3/tests/parser/parserTests.txt 2011-06-02 00:11:38 UTC (rev
89307)
+++ trunk/phase3/tests/parser/parserTests.txt 2011-06-02 00:32:43 UTC (rev
89308)
@@ -3878,7 +3878,7 @@
!! test
pre-save transform: Signature expansion in nowiki tags (bug 93)
!! options
-pst
+pst disabled
!! input
Shall not expand:
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
