| Index: trunk/phase3/includes/parser/Parser.php |
| — | — | @@ -4267,7 +4267,7 @@ |
| 4268 | 4268 | public function startExternalParse( Title $title = null, ParserOptions $options, $outputType, $clearState = true ) { |
| 4269 | 4269 | $this->startParse( $title, $options, $outputType, $clearState ); |
| 4270 | 4270 | } |
| 4271 | | - |
| | 4271 | + |
| 4272 | 4272 | private function startParse( Title $title = null, ParserOptions $options, $outputType, $clearState = true ) { |
| 4273 | 4273 | $this->setTitle( $title ); |
| 4274 | 4274 | $this->mOptions = $options; |
| — | — | @@ -4860,7 +4860,7 @@ |
| 4861 | 4861 | /** |
| 4862 | 4862 | * Replace transparent tags in $text with the values given by the callbacks. |
| 4863 | 4863 | * |
| 4864 | | - * Transparent tag hooks are like regular XML-style tag hooks, except they |
| | 4864 | + * Transparent tag hooks are like regular XML-style tag hooks, except they |
| 4865 | 4865 | * operate late in the transformation sequence, on HTML instead of wikitext. |
| 4866 | 4866 | */ |
| 4867 | 4867 | function replaceTransparentTags( $text ) { |
| — | — | @@ -5227,13 +5227,13 @@ |
| 5228 | 5228 | } |
| 5229 | 5229 | |
| 5230 | 5230 | /** |
| 5231 | | - * Call a callback function on all regions of the given text that are not |
| 5232 | | - * inside strip markers, and replace those regions with the return value |
| | 5231 | + * Call a callback function on all regions of the given text that are not |
| | 5232 | + * inside strip markers, and replace those regions with the return value |
| 5233 | 5233 | * of the callback. For example, with input: |
| 5234 | 5234 | * |
| 5235 | 5235 | * aaa<MARKER>bbb |
| 5236 | 5236 | * |
| 5237 | | - * This will call the callback function twice, with 'aaa' and 'bbb'. Those |
| | 5237 | + * This will call the callback function twice, with 'aaa' and 'bbb'. Those |
| 5238 | 5238 | * two strings will be replaced with the value returned by the callback in |
| 5239 | 5239 | * each case. |
| 5240 | 5240 | */ |
| — | — | @@ -5262,15 +5262,15 @@ |
| 5263 | 5263 | } |
| 5264 | 5264 | |
| 5265 | 5265 | /** |
| 5266 | | - * Save the parser state required to convert the given half-parsed text to |
| 5267 | | - * HTML. "Half-parsed" in this context means the output of |
| 5268 | | - * recursiveTagParse() or internalParse(). This output has strip markers |
| 5269 | | - * from replaceVariables (extensionSubstitution() etc.), and link |
| 5270 | | - * placeholders from replaceLinkHolders(). |
| | 5266 | + * Save the parser state required to convert the given half-parsed text to |
| | 5267 | + * HTML. "Half-parsed" in this context means the output of |
| | 5268 | + * recursiveTagParse() or internalParse(). This output has strip markers |
| | 5269 | + * from replaceVariables (extensionSubstitution() etc.), and link |
| | 5270 | + * placeholders from replaceLinkHolders(). |
| 5271 | 5271 | * |
| 5272 | | - * Returns an array which can be serialized and stored persistently. This |
| 5273 | | - * array can later be loaded into another parser instance with |
| 5274 | | - * unserializeHalfParsedText(). The text can then be safely incorporated into |
| | 5272 | + * Returns an array which can be serialized and stored persistently. This |
| | 5273 | + * array can later be loaded into another parser instance with |
| | 5274 | + * unserializeHalfParsedText(). The text can then be safely incorporated into |
| 5275 | 5275 | * the return value of a parser hook. |
| 5276 | 5276 | */ |
| 5277 | 5277 | function serializeHalfParsedText( $text ) { |
| — | — | @@ -5287,14 +5287,14 @@ |
| 5288 | 5288 | |
| 5289 | 5289 | /** |
| 5290 | 5290 | * Load the parser state given in the $data array, which is assumed to |
| 5291 | | - * have been generated by serializeHalfParsedText(). The text contents is |
| 5292 | | - * extracted from the array, and its markers are transformed into markers |
| 5293 | | - * appropriate for the current Parser instance. This transformed text is |
| | 5291 | + * have been generated by serializeHalfParsedText(). The text contents is |
| | 5292 | + * extracted from the array, and its markers are transformed into markers |
| | 5293 | + * appropriate for the current Parser instance. This transformed text is |
| 5294 | 5294 | * returned, and can be safely included in the return value of a parser |
| 5295 | 5295 | * hook. |
| 5296 | 5296 | * |
| 5297 | | - * If the $data array has been stored persistently, the caller should first |
| 5298 | | - * check whether it is still valid, by calling isValidHalfParsedData(). |
| | 5297 | + * If the $data array has been stored persistently, the caller should first |
| | 5298 | + * check whether it is still valid, by calling isValidHalfParsedText(). |
| 5299 | 5299 | * |
| 5300 | 5300 | * @param $data Serialized data |
| 5301 | 5301 | * @return String |
| — | — | @@ -5316,13 +5316,13 @@ |
| 5317 | 5317 | } |
| 5318 | 5318 | |
| 5319 | 5319 | /** |
| 5320 | | - * Returns true if the given array, presumed to be generated by |
| 5321 | | - * serializeHalfParsedText(), is compatible with the current version of the |
| | 5320 | + * Returns true if the given array, presumed to be generated by |
| | 5321 | + * serializeHalfParsedText(), is compatible with the current version of the |
| 5322 | 5322 | * parser. |
| 5323 | 5323 | * |
| 5324 | 5324 | * @param $data Array. |
| 5325 | 5325 | */ |
| 5326 | | - function isValidHalfParsedData( $data ) { |
| | 5326 | + function isValidHalfParsedText( $data ) { |
| 5327 | 5327 | return isset( $data['version'] ) && $data['version'] == self::HALF_PARSED_VERSION; |
| 5328 | 5328 | } |
| 5329 | 5329 | } |