X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Ffilebackend%2FFileBackendStore.php;h=e5ce968a97226c13be78ebe5d16d297b96166b9f;hp=e4b07b85e1b13f0e9e078a44d6da2a6f439c07cd;hb=5262d41a6c35ad37b834a39059d650ebc348299a;hpb=02f609e06889a172c64a863481cc5f692f86e64a

diff --git a/includes/filebackend/FileBackendStore.php b/includes/filebackend/FileBackendStore.php
index e4b07b85e1..e5ce968a97 100644
--- a/includes/filebackend/FileBackendStore.php
+++ b/includes/filebackend/FileBackendStore.php
@@ -1058,7 +1058,7 @@ abstract class FileBackendStore extends FileBackend {
 	public function getScopedLocksForOps( array $ops, Status $status ) {
 		$paths = $this->getPathsToLockForOpsInternal( $this->getOperationsInternal( $ops ) );
 
-		return array( $this->getScopedFileLocks( $paths, 'mixed', $status ) );
+		return $this->getScopedFileLocks( $paths, 'mixed', $status );
 	}
 
 	final protected function doOperationsInternal( array $ops, array $opts ) {
@@ -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
@@ -1751,7 +1752,7 @@ abstract class FileBackendStore extends FileBackend {
 				$pathNames[$this->fileCacheKey( $path )] = $path;
 			}
 		}
-		// Get all cache entries for these container cache keys...
+		// Get all cache entries for these file cache keys...
 		$values = $this->memCache->getMulti( array_keys( $pathNames ) );
 		foreach ( $values as $cacheKey => $val ) {
 			$path = $pathNames[$cacheKey];