* EOL w/s cleanup

* Normalize function names to eliminate two references to “HalfParsedDATA”

diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 4bfc4db..b9341d2 100644 (file)
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -4267,7 +4267,7 @@ class Parser {
        public function startExternalParse( Title $title = null, ParserOptions $options, $outputType, $clearState = true ) {
                $this->startParse( $title, $options, $outputType, $clearState );
        }
-       
+
        private function startParse( Title $title = null, ParserOptions $options, $outputType, $clearState = true ) {
                $this->setTitle( $title );
                $this->mOptions = $options;
@@ -4860,7 +4860,7 @@ class Parser {
        /**
         * Replace transparent tags in $text with the values given by the callbacks.
         *
-        * Transparent tag hooks are like regular XML-style tag hooks, except they 
+        * Transparent tag hooks are like regular XML-style tag hooks, except they
         * operate late in the transformation sequence, on HTML instead of wikitext.
         */
        function replaceTransparentTags( $text ) {
@@ -5227,13 +5227,13 @@ class Parser {
        }
 
        /**
-        * Call a callback function on all regions of the given text that are not 
-        * inside strip markers, and replace those regions with the return value 
+        * Call a callback function on all regions of the given text that are not
+        * inside strip markers, and replace those regions with the return value
         * of the callback. For example, with input:
         *
         *  aaa<MARKER>bbb
         *
-        * This will call the callback function twice, with 'aaa' and 'bbb'. Those 
+        * This will call the callback function twice, with 'aaa' and 'bbb'. Those
         * two strings will be replaced with the value returned by the callback in
         * each case.
         */
@@ -5262,15 +5262,15 @@ class Parser {
        }
 
        /**
-        * Save the parser state required to convert the given half-parsed text to 
-        * HTML. "Half-parsed" in this context means the output of 
-        * recursiveTagParse() or internalParse(). This output has strip markers 
-        * from replaceVariables (extensionSubstitution() etc.), and link 
-        * placeholders from replaceLinkHolders(). 
+        * Save the parser state required to convert the given half-parsed text to
+        * HTML. "Half-parsed" in this context means the output of
+        * recursiveTagParse() or internalParse(). This output has strip markers
+        * from replaceVariables (extensionSubstitution() etc.), and link
+        * placeholders from replaceLinkHolders().
         *
-        * Returns an array which can be serialized and stored persistently. This 
-        * array can later be loaded into another parser instance with 
-        * unserializeHalfParsedText(). The text can then be safely incorporated into 
+        * Returns an array which can be serialized and stored persistently. This
+        * array can later be loaded into another parser instance with
+        * unserializeHalfParsedText(). The text can then be safely incorporated into
         * the return value of a parser hook.
         */
        function serializeHalfParsedText( $text ) {
@@ -5287,14 +5287,14 @@ class Parser {
 
        /**
         * Load the parser state given in the $data array, which is assumed to
-        * have been generated by serializeHalfParsedText(). The text contents is 
-        * extracted from the array, and its markers are transformed into markers 
-        * appropriate for the current Parser instance. This transformed text is 
+        * have been generated by serializeHalfParsedText(). The text contents is
+        * extracted from the array, and its markers are transformed into markers
+        * appropriate for the current Parser instance. This transformed text is
         * returned, and can be safely included in the return value of a parser
         * hook.
         *
-        * If the $data array has been stored persistently, the caller should first 
-        * check whether it is still valid, by calling isValidHalfParsedData().
+        * If the $data array has been stored persistently, the caller should first
+        * check whether it is still valid, by calling isValidHalfParsedText().
         *
         * @param $data Serialized data
         * @return String
@@ -5316,13 +5316,13 @@ class Parser {
        }
 
        /**
-        * Returns true if the given array, presumed to be generated by 
-        * serializeHalfParsedText(), is compatible with the current version of the 
+        * Returns true if the given array, presumed to be generated by
+        * serializeHalfParsedText(), is compatible with the current version of the
         * parser.
         *
         * @param $data Array.
         */
-       function isValidHalfParsedData( $data ) {
+       function isValidHalfParsedText( $data ) {
                return isset( $data['version'] ) && $data['version'] == self::HALF_PARSED_VERSION;
        }
 }