http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89662
Revision: 89662
Author: brion
Date: 2011-06-07 17:34:20 +0000 (Tue, 07 Jun 2011)
Log Message:
-----------
Provisional revert of r89648: "Another try at fixing bug 93 "tilde signatures
inside nowiki tags sometimes get expanded
(<includeonly><nowiki>~~~~</nowiki></includeonly>)""
This seems to disable PST for <includeonly>...</includeonly> in addition to the
<includeonly><nowiki>...</nowiki></includeonly> that the bug is about.
This was caught by a parser test case, but the test case was changed to
match... seems like the wrong change?
Also failed to update Preprocessor_HipHop.hphp to match the other two
preprocessor classes.
Modified Paths:
--------------
trunk/phase3/RELEASE-NOTES-1.19
trunk/phase3/includes/parser/Preprocessor_DOM.php
trunk/phase3/includes/parser/Preprocessor_Hash.php
trunk/phase3/tests/parser/parserTests.txt
Modified: trunk/phase3/RELEASE-NOTES-1.19
===================================================================
--- trunk/phase3/RELEASE-NOTES-1.19 2011-06-07 17:33:58 UTC (rev 89661)
+++ trunk/phase3/RELEASE-NOTES-1.19 2011-06-07 17:34:20 UTC (rev 89662)
@@ -86,8 +86,6 @@
* (bug 29101) Special:FileDuplicateSearch shows silly message
* (bug 29048) jQuery.tabIndex: firstTabIndex() should not output the same
as lastTabIndex().
-* (bug 93) tilde signatures inside nowiki tags sometimes get expanded
- (<includeonly><nowiki>~~~~</nowiki></includeonly>)
=== API changes in 1.19 ===
* BREAKING CHANGE: action=watch now requires POST and token.
Modified: trunk/phase3/includes/parser/Preprocessor_DOM.php
===================================================================
--- trunk/phase3/includes/parser/Preprocessor_DOM.php 2011-06-07 17:33:58 UTC
(rev 89661)
+++ trunk/phase3/includes/parser/Preprocessor_DOM.php 2011-06-07 17:34:20 UTC
(rev 89662)
@@ -1089,11 +1089,8 @@
# OT_WIKI will only respect <ignore> in
substed templates.
# The other output types respect it
unless NO_IGNORE is set.
# extractSections() sets NO_IGNORE and
so never respects it.
- if ( $flags & PPFrame::NO_IGNORE ) {
+ if ( ( !isset( $this->parent ) &&
$this->parser->ot['wiki'] ) || ( $flags & PPFrame::NO_IGNORE ) ) {
$out .=
$contextNode->textContent;
- # Add a strip marker in PST mode so
that pstPass2() can run some old-fashioned regexes on the result
- } elseif ( !isset( $this->parent ) &&
$this->parser->ot['wiki'] ) {
- $out .=
$this->parser->insertStripItem( $contextNode->textContent );
} else {
$out .= '';
}
Modified: trunk/phase3/includes/parser/Preprocessor_Hash.php
===================================================================
--- trunk/phase3/includes/parser/Preprocessor_Hash.php 2011-06-07 17:33:58 UTC
(rev 89661)
+++ trunk/phase3/includes/parser/Preprocessor_Hash.php 2011-06-07 17:34:20 UTC
(rev 89662)
@@ -1019,11 +1019,8 @@
# OT_WIKI will only respect <ignore> in
substed templates.
# The other output types respect it
unless NO_IGNORE is set.
# extractSections() sets NO_IGNORE and
so never respects it.
- if ( $flags & PPFrame::NO_IGNORE ) {
+ if ( ( !isset( $this->parent ) &&
$this->parser->ot['wiki'] ) || ( $flags & PPFrame::NO_IGNORE ) ) {
$out .=
$contextNode->firstChild->value;
- # Add a strip marker in PST mode so
that pstPass2() can run some old-fashioned regexes on the result
- } elseif ( !isset( $this->parent ) &&
$this->parser->ot['wiki'] ) {
- $out .=
$this->parser->insertStripItem( $contextNode->firstChild->value );
} else {
//$out .= '';
}
Modified: trunk/phase3/tests/parser/parserTests.txt
===================================================================
--- trunk/phase3/tests/parser/parserTests.txt 2011-06-07 17:33:58 UTC (rev
89661)
+++ trunk/phase3/tests/parser/parserTests.txt 2011-06-07 17:34:20 UTC (rev
89662)
@@ -3926,7 +3926,7 @@
!! result
* [[Special:Contributions/127.0.0.1|127.0.0.1]]
* <noinclude>[[Special:Contributions/127.0.0.1|127.0.0.1]]</noinclude>
-* <includeonly>~~~</includeonly>
+* <includeonly>[[Special:Contributions/127.0.0.1|127.0.0.1]]</includeonly>
* <onlyinclude>[[Special:Contributions/127.0.0.1|127.0.0.1]]</onlyinclude>
!! end
@@ -3934,7 +3934,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
