Merge "Forward port of https://www.mediawiki.org/wiki/Special:Code/MediaWiki/105964"

diff --git a/includes/MagicWord.php b/includes/MagicWord.php
index 131ae1d..c304f8a 100644 (file)
--- a/includes/MagicWord.php
+++ b/includes/MagicWord.php
@@ -291,8 +291,8 @@ class MagicWord {
                $wgContLang->getMagic( $this );
                if ( !$this->mSynonyms ) {
                        $this->mSynonyms = array( 'dkjsagfjsgashfajsh' );
-                       #throw new MWException( "Error: invalid magic word '$id'" );
-                       wfDebugLog( 'exception', "Error: invalid magic word '$id'\n" );
+                       throw new MWException( "Error: invalid magic word '$id'" );
+                       #wfDebugLog( 'exception', "Error: invalid magic word '$id'\n" );
                }
                wfProfileOut( __METHOD__ );
        }