Merge "Rewrite passwordtoopopular message"

[lhc/web/wiklou.git] / includes / parser / Preprocessor_DOM.php

diff --git a/includes/parser/Preprocessor_DOM.php b/includes/parser/Preprocessor_DOM.php
index 4db2855..09ca38a 100644 (file)
--- a/includes/parser/Preprocessor_DOM.php
+++ b/includes/parser/Preprocessor_DOM.php
@@ -86,9 +86,9 @@ class Preprocessor_DOM extends Preprocessor {
                $xml .= "</list>";
 
                $dom = new DOMDocument();
-               MediaWiki\suppressWarnings();
+               Wikimedia\suppressWarnings();
                $result = $dom->loadXML( $xml );
-               MediaWiki\restoreWarnings();
+               Wikimedia\restoreWarnings();
                if ( !$result ) {
                        // Try running the XML through UtfNormal to get rid of invalid characters
                        $xml = UtfNormal\Validator::cleanUp( $xml );
@@ -163,9 +163,9 @@ class Preprocessor_DOM extends Preprocessor {
                }
 
                $dom = new DOMDocument;
-               MediaWiki\suppressWarnings();
+               Wikimedia\suppressWarnings();
                $result = $dom->loadXML( $xml );
-               MediaWiki\restoreWarnings();
+               Wikimedia\restoreWarnings();
                if ( !$result ) {
                        // Try running the XML through UtfNormal to get rid of invalid characters
                        $xml = UtfNormal\Validator::cleanUp( $xml );
@@ -794,9 +794,6 @@ class Preprocessor_DOM extends Preprocessor {
                                $stack->getCurrentPart()->eqpos = strlen( $accum );
                                $accum .= '=';
                                ++$i;
-                       } elseif ( $found == 'dash' ) {
-                               $accum .= '-';
-                               ++$i;
                        }
                }