Merge branch 'mw-1.26'

3 files changed, 3 insertions, 4 deletions

diff --git a/includes/filebackend/lockmanager/DBLockManager.php b/includes/filebackend/lockmanager/DBLockManager.php
index 39a55635..b81cf3e4 100644
--- a/includes/filebackend/lockmanager/DBLockManager.php
+++ b/includes/filebackend/lockmanager/DBLockManager.php
@@ -96,7 +96,7 @@ 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() );
+					$this->statusCache = ObjectCache::newAccelerator();
 				} catch ( Exception $e ) {
 					trigger_error( __CLASS__ .
 						" using multiple DB peers without apc, xcache, or wincache." );
diff --git a/includes/filebackend/lockmanager/FSLockManager.php b/includes/filebackend/lockmanager/FSLockManager.php
index bce6b34c..6f46f0e4 100644
--- a/includes/filebackend/lockmanager/FSLockManager.php
+++ b/includes/filebackend/lockmanager/FSLockManager.php
@@ -117,9 +117,9 @@ class FSLockManager extends LockManager {
 			if ( isset( $this->handles[$path] ) ) {
 				$handle = $this->handles[$path];
 			} else {
-				wfSuppressWarnings();
+				MediaWiki\suppressWarnings();
 				$handle = fopen( $this->getLockPath( $path ), 'a+' );
-				wfRestoreWarnings();
+				MediaWiki\restoreWarnings();
 				if ( !$handle ) { // lock dir missing?
 					wfMkdirParents( $this->lockDir );
 					$handle = fopen( $this->getLockPath( $path ), 'a+' ); // try again
diff --git a/includes/filebackend/lockmanager/LockManager.php b/includes/filebackend/lockmanager/LockManager.php
index 615ba77e..8115fd42 100644
--- a/includes/filebackend/lockmanager/LockManager.php
+++ b/includes/filebackend/lockmanager/LockManager.php
@@ -102,7 +102,6 @@ abstract class LockManager {
 	 * @since 1.22
 	 */
 	final public function lockByType( array $pathsByType, $timeout = 0 ) {
-		$status = Status::newGood();
 		$pathsByType = $this->normalizePathsByType( $pathsByType );
 		$msleep = array( 0, 50, 100, 300, 500 ); // retry backoff times
 		$start = microtime( true );