From f6d65e533c62f6deb21342d4901ece24497b433e Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Thu, 4 Jun 2015 07:31:04 +0200 Subject: Update to MediaWiki 1.25.1 --- includes/filebackend/lockmanager/MemcLockManager.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'includes/filebackend/lockmanager/MemcLockManager.php') diff --git a/includes/filebackend/lockmanager/MemcLockManager.php b/includes/filebackend/lockmanager/MemcLockManager.php index 9bb01c21..24d96e02 100644 --- a/includes/filebackend/lockmanager/MemcLockManager.php +++ b/includes/filebackend/lockmanager/MemcLockManager.php @@ -55,13 +55,13 @@ class MemcLockManager extends QuorumLockManager { /** * Construct a new instance from configuration. * - * @param array $config Paramaters include: + * @param array $config Parameters include: * - lockServers : Associative array of server names to ":" strings. * - srvsByBucket : Array of 1-16 consecutive integer keys, starting from 0, * each having an odd-numbered list of server names (peers) as values. * - memcConfig : Configuration array for ObjectCache::newFromParams. [optional] * If set, this must use one of the memcached classes. - * @throws MWException + * @throws Exception */ public function __construct( array $config ) { parent::__construct( $config ); @@ -80,7 +80,7 @@ class MemcLockManager extends QuorumLockManager { if ( $cache instanceof MemcachedBagOStuff ) { $this->bagOStuffs[$name] = $cache; } else { - throw new MWException( + throw new Exception( 'Only MemcachedBagOStuff classes are supported by MemcLockManager.' ); } } -- cgit v1.2.3-54-g00ecf