From 0ec8125642ebfefd324db4f22a3cbc11a725d6cd Mon Sep 17 00:00:00 2001 From: Kunal Mehta Date: Mon, 11 Jun 2018 13:57:58 -0700 Subject: [PATCH] registration: Catch correct exception type from ObjectCache ObjectCache::newFromId() now throws an InvalidArgumentException if the specific id can't be found. Change-Id: Idcb0f2158a38555c1ec1681ba0635c7903e48718 --- includes/registration/ExtensionRegistry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- 2.20.1