From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Sun, 5 Feb 2012 03:52:40 +0000 (+0000)
Subject: Removed some useless code and a confusing comment in FSLockManager::doLock(). This... 
X-Git-Tag: 1.31.0-rc.0~24934
X-Git-Url: http://git.cyclocoop.org/%22.%24image2.%22?a=commitdiff_plain;h=b692b67edb3ee84705509f08117da9d625540bf6;p=lhc%2Fweb%2Fwiklou.git

Removed some useless code and a confusing comment in FSLockManager::doLock(). This was from before referencing counting was used.
---

diff --git a/includes/filerepo/backend/lockmanager/FSLockManager.php b/includes/filerepo/backend/lockmanager/FSLockManager.php
index 33aceb447a..42074fd3fb 100644
--- a/includes/filerepo/backend/lockmanager/FSLockManager.php
+++ b/includes/filerepo/backend/lockmanager/FSLockManager.php
@@ -43,14 +43,9 @@ class FSLockManager extends LockManager {
 
 		$lockedPaths = array(); // files locked in this attempt
 		foreach ( $paths as $path ) {
-			$subStatus = $this->doSingleLock( $path, $type );
-			$status->merge( $subStatus );
+			$status->merge( $this->doSingleLock( $path, $type ) );
 			if ( $status->isOK() ) {
-				// Don't append to $lockedPaths if $path is already locked.
-				// We do NOT want to unlock the key if we have to rollback.
-				if ( $subStatus->isGood() ) { // no warnings/fatals?
-					$lockedPaths[] = $path;
-				}
+				$lockedPaths[] = $path;
 			} else {
 				// Abort and unlock everything
 				$status->merge( $this->doUnlock( $lockedPaths, $type ) );