From: Kunal Mehta <legoktm@member.fsf.org>
Date: Mon, 11 Jun 2018 20:57:58 +0000 (-0700)
Subject: registration: Catch correct exception type from ObjectCache
X-Git-Tag: 1.34.0-rc.0~5117
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmes_infos.php?a=commitdiff_plain;h=0ec8125642ebfefd324db4f22a3cbc11a725d6cd;p=lhc%2Fweb%2Fwiklou.git

registration: Catch correct exception type from ObjectCache

ObjectCache::newFromId() now throws an InvalidArgumentException if the
specific id can't be found.

Change-Id: Idcb0f2158a38555c1ec1681ba0635c7903e48718
---

diff --git a/includes/registration/ExtensionRegistry.php b/includes/registration/ExtensionRegistry.php
index a3684e8da5..c58b55ebfd 100644
--- a/includes/registration/ExtensionRegistry.php
+++ b/includes/registration/ExtensionRegistry.php
@@ -144,7 +144,7 @@ class ExtensionRegistry {
 			// been loaded
 			$cacheId = ObjectCache::detectLocalServerCache();
 			$cache = ObjectCache::newFromId( $cacheId );
-		} catch ( MWException $e ) {
+		} catch ( InvalidArgumentException $e ) {
 			$cache = new EmptyBagOStuff();
 		}
 		// See if this queue is in APC