r89308 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r89307‎ | r89308 | r89309 >
Date:00:32, 2 June 2011
Author:brion
Status:ok
Tags:
Comment:
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 (modified) (history)
  • /trunk/phase3/includes/parser/Preprocessor_Hash.php (modified) (history)
  • /trunk/phase3/tests/parser/parserTests.txt (modified) (history)

Diff [purge]

Index: trunk/phase3/tests/parser/parserTests.txt
@@ -3878,7 +3878,7 @@
38793879 !! test
38803880 pre-save transform: Signature expansion in nowiki tags (bug 93)
38813881 !! options
3882 -pst
 3882+pst disabled
38833883 !! input
38843884 Shall not expand:
38853885
Index: trunk/phase3/includes/parser/Preprocessor_Hash.php
@@ -148,9 +148,6 @@
149149 if ( strpos( $text, '<onlyinclude>' ) !== false && strpos( $text, '</onlyinclude>' ) !== false ) {
150150 $enableOnlyinclude = true;
151151 }
152 - } else if ( $this->parser->ot['wiki'] ) {
153 - $ignoredTags = array( 'noinclude', '/noinclude', 'onlyinclude', '/onlyinclude', 'includeonly', '/includeonly' );
154 - $ignoredElements = array();
155152 } else {
156153 $ignoredTags = array( 'noinclude', '/noinclude', 'onlyinclude', '/onlyinclude' );
157154 $ignoredElements = array( 'includeonly' );
Index: trunk/phase3/includes/parser/Preprocessor_DOM.php
@@ -205,9 +205,6 @@
206206 if ( strpos( $text, '<onlyinclude>' ) !== false && strpos( $text, '</onlyinclude>' ) !== false ) {
207207 $enableOnlyinclude = true;
208208 }
209 - } else if ( isset( $this->parser->ot ) && $this->parser->ot['wiki'] ) {
210 - $ignoredTags = array( 'noinclude', '/noinclude', 'onlyinclude', '/onlyinclude', 'includeonly', '/includeonly' );
211 - $ignoredElements = array();
212209 } else {
213210 $ignoredTags = array( 'noinclude', '/noinclude', 'onlyinclude', '/onlyinclude' );
214211 $ignoredElements = array( 'includeonly' );

Follow-up revisions

RevisionCommit summaryAuthorDate
r89648Another try at fixing bug 93 "tilde signatures inside nowiki tags sometimes g...pcopp15:12, 7 June 2011
r89662Provisional revert of r89648: "Another try at fixing bug 93 "tilde signatures...brion17:34, 7 June 2011

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r5295BUG#93 Fix handling of <nowiki> in templatesjeluf23:14, 18 September 2004
r5296BUG#93 Fix handling of <nowiki> in templates. From HEADjeluf23:17, 18 September 2004
r13917(bug 93) <nowiki> tags and tildes in templatesrobchurch02:20, 29 April 2006
r88997fix for Bug #93 “tilde signatures inside nowiki tags sometimes get expanded...mah20:55, 27 May 2011
r89191Revert r89013 and add better tests.platonides22:25, 30 May 2011

Status & tagging log