From: Reedy <reedy@wikimedia.org>
Date: Mon, 28 May 2012 14:43:06 +0000 (+0100)
Subject: Forward port of https://www.mediawiki.org/wiki/Special:Code/MediaWiki/105964
X-Git-Tag: 1.31.0-rc.0~23486
X-Git-Url: https://git.cyclocoop.org//%22?a=commitdiff_plain;h=73bbe9f3a2c53a10523b9e487b33ab9f82a07344;p=lhc%2Fweb%2Fwiklou.git

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

"Temporary workaround for bug 31576. The logs show that once every hour or so, a job runner somewhere in the cluster somehow loses all its magic words and starts hitting this case. Throwing an exception should kill the job runner before it does too much damage."

Currently keeps being re-imported into deployment branches...

Change-Id: I9d6ef2f4e0755a86476388508a8c08266fc94a9f
---

diff --git a/includes/MagicWord.php b/includes/MagicWord.php
index ba38f37986..f838ad0134 100644
--- a/includes/MagicWord.php
+++ b/includes/MagicWord.php
@@ -306,8 +306,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__ );
 	}