| Index: trunk/phase3/includes/filerepo/backend/lockmanager/FSLockManager.php |
| — | — | @@ -43,14 +43,9 @@ |
| 44 | 44 | |
| 45 | 45 | $lockedPaths = array(); // files locked in this attempt |
| 46 | 46 | foreach ( $paths as $path ) { |
| 47 | | - $subStatus = $this->doSingleLock( $path, $type ); |
| 48 | | - $status->merge( $subStatus ); |
| | 47 | + $status->merge( $this->doSingleLock( $path, $type ) ); |
| 49 | 48 | if ( $status->isOK() ) { |
| 50 | | - // Don't append to $lockedPaths if $path is already locked. |
| 51 | | - // We do NOT want to unlock the key if we have to rollback. |
| 52 | | - if ( $subStatus->isGood() ) { // no warnings/fatals? |
| 53 | | - $lockedPaths[] = $path; |
| 54 | | - } |
| | 49 | + $lockedPaths[] = $path; |
| 55 | 50 | } else { |
| 56 | 51 | // Abort and unlock everything |
| 57 | 52 | $status->merge( $this->doUnlock( $lockedPaths, $type ) ); |