| Index: trunk/phase3/includes/parser/Parser.php |
| — | — | @@ -329,8 +329,8 @@ |
| 330 | 330 | |
| 331 | 331 | /** |
| 332 | 332 | * A converted title will be provided in the output object if title and |
| 333 | | - * content conversion are enabled, the article text does not contain |
| 334 | | - * a conversion-suppressing double-underscore tag, and no |
| | 333 | + * content conversion are enabled, the article text does not contain |
| | 334 | + * a conversion-suppressing double-underscore tag, and no |
| 335 | 335 | * {{DISPLAYTITLE:...}} is present. DISPLAYTITLE takes precedence over |
| 336 | 336 | * automatic link conversion. |
| 337 | 337 | */ |
| — | — | @@ -483,7 +483,9 @@ |
| 484 | 484 | |
| 485 | 485 | $flags = PPFrame::NO_ARGS | PPFrame::NO_TEMPLATES; |
| 486 | 486 | $dom = $this->preprocessToDom( $text, self::PTD_FOR_INCLUSION ); |
| 487 | | - return $this->getPreprocessor()->newFrame()->expand( $dom, $flags ); |
| | 487 | + $text = $this->getPreprocessor()->newFrame()->expand( $dom, $flags ); |
| | 488 | + $text = $this->mStripState->unstripBoth( $text ); |
| | 489 | + return $text; |
| 488 | 490 | } |
| 489 | 491 | |
| 490 | 492 | /** |
| — | — | @@ -4095,7 +4097,7 @@ |
| 4096 | 4098 | # Because mOutputType is OT_WIKI, this will only process {{subst:xxx}} type tags |
| 4097 | 4099 | $text = $this->replaceVariables( $text ); |
| 4098 | 4100 | |
| 4099 | | - # This works almost by chance, as the replaceVariables are done before the getUserSig(), |
| | 4101 | + # This works almost by chance, as the replaceVariables are done before the getUserSig(), |
| 4100 | 4102 | # which may corrupt this parser instance via its wfMsgExt( parsemag ) call- |
| 4101 | 4103 | |
| 4102 | 4104 | # Signatures |
| — | — | @@ -4984,9 +4986,9 @@ |
| 4985 | 4987 | } |
| 4986 | 4988 | |
| 4987 | 4989 | /** |
| 4988 | | - * This function returns $oldtext after the content of the section |
| | 4990 | + * This function returns $oldtext after the content of the section |
| 4989 | 4991 | * specified by $section has been replaced with $text. |
| 4990 | | - * |
| | 4992 | + * |
| 4991 | 4993 | * @param $text String: former text of the article |
| 4992 | 4994 | * @param $section Numeric: section identifier |
| 4993 | 4995 | * @param $text String: replacing text |