| Index: trunk/phase3/RELEASE-NOTES-1.19 |
| — | — | @@ -86,8 +86,6 @@ |
| 87 | 87 | * (bug 29101) Special:FileDuplicateSearch shows silly message |
| 88 | 88 | * (bug 29048) jQuery.tabIndex: firstTabIndex() should not output the same |
| 89 | 89 | as lastTabIndex(). |
| 90 | | -* (bug 93) tilde signatures inside nowiki tags sometimes get expanded |
| 91 | | - (<includeonly><nowiki>~~~~</nowiki></includeonly>) |
| 92 | 90 | |
| 93 | 91 | === API changes in 1.19 === |
| 94 | 92 | * BREAKING CHANGE: action=watch now requires POST and token. |
| Index: trunk/phase3/tests/parser/parserTests.txt |
| — | — | @@ -3926,7 +3926,7 @@ |
| 3927 | 3927 | !! result |
| 3928 | 3928 | * [[Special:Contributions/127.0.0.1|127.0.0.1]] |
| 3929 | 3929 | * <noinclude>[[Special:Contributions/127.0.0.1|127.0.0.1]]</noinclude> |
| 3930 | | -* <includeonly>~~~</includeonly> |
| | 3930 | +* <includeonly>[[Special:Contributions/127.0.0.1|127.0.0.1]]</includeonly> |
| 3931 | 3931 | * <onlyinclude>[[Special:Contributions/127.0.0.1|127.0.0.1]]</onlyinclude> |
| 3932 | 3932 | !! end |
| 3933 | 3933 | |
| — | — | @@ -3934,7 +3934,7 @@ |
| 3935 | 3935 | !! test |
| 3936 | 3936 | pre-save transform: Signature expansion in nowiki tags (bug 93) |
| 3937 | 3937 | !! options |
| 3938 | | -pst |
| | 3938 | +pst disabled |
| 3939 | 3939 | !! input |
| 3940 | 3940 | Shall not expand: |
| 3941 | 3941 | |
| Index: trunk/phase3/includes/parser/Preprocessor_Hash.php |
| — | — | @@ -1019,11 +1019,8 @@ |
| 1020 | 1020 | # OT_WIKI will only respect <ignore> in substed templates. |
| 1021 | 1021 | # The other output types respect it unless NO_IGNORE is set. |
| 1022 | 1022 | # extractSections() sets NO_IGNORE and so never respects it. |
| 1023 | | - if ( $flags & PPFrame::NO_IGNORE ) { |
| | 1023 | + if ( ( !isset( $this->parent ) && $this->parser->ot['wiki'] ) || ( $flags & PPFrame::NO_IGNORE ) ) { |
| 1024 | 1024 | $out .= $contextNode->firstChild->value; |
| 1025 | | - # Add a strip marker in PST mode so that pstPass2() can run some old-fashioned regexes on the result |
| 1026 | | - } elseif ( !isset( $this->parent ) && $this->parser->ot['wiki'] ) { |
| 1027 | | - $out .= $this->parser->insertStripItem( $contextNode->firstChild->value ); |
| 1028 | 1025 | } else { |
| 1029 | 1026 | //$out .= ''; |
| 1030 | 1027 | } |
| Index: trunk/phase3/includes/parser/Preprocessor_DOM.php |
| — | — | @@ -1089,11 +1089,8 @@ |
| 1090 | 1090 | # OT_WIKI will only respect <ignore> in substed templates. |
| 1091 | 1091 | # The other output types respect it unless NO_IGNORE is set. |
| 1092 | 1092 | # extractSections() sets NO_IGNORE and so never respects it. |
| 1093 | | - if ( $flags & PPFrame::NO_IGNORE ) { |
| | 1093 | + if ( ( !isset( $this->parent ) && $this->parser->ot['wiki'] ) || ( $flags & PPFrame::NO_IGNORE ) ) { |
| 1094 | 1094 | $out .= $contextNode->textContent; |
| 1095 | | - # Add a strip marker in PST mode so that pstPass2() can run some old-fashioned regexes on the result |
| 1096 | | - } elseif ( !isset( $this->parent ) && $this->parser->ot['wiki'] ) { |
| 1097 | | - $out .= $this->parser->insertStripItem( $contextNode->textContent ); |
| 1098 | 1095 | } else { |
| 1099 | 1096 | $out .= ''; |
| 1100 | 1097 | } |