Merge "Avoid passing anything but a string to Title::newFromText in UploadBase::getTitle"

[lhc/web/wiklou.git] / includes / filebackend / lockmanager / DBLockManager.php

diff --git a/includes/filebackend/lockmanager/DBLockManager.php b/includes/filebackend/lockmanager/DBLockManager.php
index affcf44..b81cf3e 100644 (file)
--- a/includes/filebackend/lockmanager/DBLockManager.php
+++ b/includes/filebackend/lockmanager/DBLockManager.php
@@ -96,8 +96,8 @@ abstract class DBLockManager extends QuorumLockManager {
                                // Tracks peers that couldn't be queried recently to avoid lengthy
                                // connection timeouts. This is useless if each bucket has one peer.
                                try {
-                                       $this->statusCache = ObjectCache::newAccelerator( array() );
-                               } catch ( MWException $e ) {
+                                       $this->statusCache = ObjectCache::newAccelerator();
+                               } catch ( Exception $e ) {
                                        trigger_error( __CLASS__ .
                                                " using multiple DB peers without apc, xcache, or wincache." );
                                }