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/DBLockManager.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'includes/filebackend/lockmanager/DBLockManager.php') diff --git a/includes/filebackend/lockmanager/DBLockManager.php b/includes/filebackend/lockmanager/DBLockManager.php index 450ccc82..39a55635 100644 --- a/includes/filebackend/lockmanager/DBLockManager.php +++ b/includes/filebackend/lockmanager/DBLockManager.php @@ -52,7 +52,7 @@ abstract class DBLockManager extends QuorumLockManager { /** * Construct a new instance from configuration. * - * @param array $config Paramaters include: + * @param array $config Parameters include: * - dbServers : Associative array of DB names to server configuration. * Configuration is an associative array that includes: * - host : DB server name @@ -97,7 +97,7 @@ abstract class DBLockManager extends QuorumLockManager { // connection timeouts. This is useless if each bucket has one peer. try { $this->statusCache = ObjectCache::newAccelerator( array() ); - } catch ( MWException $e ) { + } catch ( Exception $e ) { trigger_error( __CLASS__ . " using multiple DB peers without apc, xcache, or wincache." ); } -- cgit v1.2.2