Reverting r45341 " Use Sanitizer::escapeId() in another place Reduce code duplication...

when $wgEnforceHtmlIds is off."

This produces non-matching stuff like "#_Rock_on_dudes_" for == ''Rock on'' dudes ==.

diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index e3ee5e7..7fcfb90 100644 (file)
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -4736,11 +4736,21 @@ class Parser
         * "== Header ==".
         */
        public function guessSectionNameFromWikiText( $text ) {
-               global $wgEnforceHtmlIds;
                # Strip out wikitext links(they break the anchor)
                $text = $this->stripSectionName( $text );
-               return '#' . Sanitizer::escapeId( $text,
-                       $wgEnforceHtmlIds ? 'noninitial' : 'xml' );
+               $headline = Sanitizer::decodeCharReferences( $text );
+               # strip out HTML
+               $headline = StringUtils::delimiterReplace( '<', '>', '', $headline );
+               $headline = trim( $headline );
+               $sectionanchor = '#' . urlencode( str_replace( ' ', '_', $headline ) );
+               $replacearray = array(
+                       '%3A' => ':',
+                       '%' => '.'
+               );
+               return str_replace(
+                       array_keys( $replacearray ),
+                       array_values( $replacearray ),
+                       $sectionanchor );
        }
 
        /**