From: Aaron Schulz <aschulz@wikimedia.org>
Date: Mon, 21 Sep 2015 06:04:29 +0000 (-0700)
Subject: Prevent IDEA error in doOperationsInternal()
X-Git-Tag: 1.31.0-rc.0~9952^2
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=fb0994d5c5c24b2553ac8ce8d7bba565f34e2f5a;p=lhc%2Fweb%2Fwiklou.git

Prevent IDEA error in doOperationsInternal()

Change-Id: I2f0a1885803fff9dc0eb8ca4a595a83736ce421b
---

diff --git a/includes/filebackend/FileBackendMultiWrite.php b/includes/filebackend/FileBackendMultiWrite.php
index 6c6a90b375..47e8dce24c 100644
--- a/includes/filebackend/FileBackendMultiWrite.php
+++ b/includes/filebackend/FileBackendMultiWrite.php
@@ -152,6 +152,7 @@ class FileBackendMultiWrite extends FileBackend {
 		// Try to lock those files for the scope of this function...
 		if ( empty( $opts['nonLocking'] ) ) {
 			// Try to lock those files for the scope of this function...
+			/** @noinspection PhpUnusedLocalVariableInspection */
 			$scopeLock = $this->getScopedLocksForOps( $ops, $status );
 			if ( !$status->isOK() ) {
 				return $status; // abort
diff --git a/includes/filebackend/FileBackendStore.php b/includes/filebackend/FileBackendStore.php
index 2562f52d42..94339643d9 100644
--- a/includes/filebackend/FileBackendStore.php
+++ b/includes/filebackend/FileBackendStore.php
@@ -1076,6 +1076,7 @@ abstract class FileBackendStore extends FileBackend {
 			// Build up a list of files to lock...
 			$paths = $this->getPathsToLockForOpsInternal( $performOps );
 			// Try to lock those files for the scope of this function...
+
 			$scopeLock = $this->getScopedFileLocks( $paths, 'mixed', $status );
 			if ( !$status->isOK() ) {
 				return $status; // abort