| Index: branches/FileBackend/phase3/includes/filerepo/backend/FileBackendMultiWrite.php |
| — | — | @@ -106,7 +106,7 @@ |
| 107 | 107 | if ( !empty( $ops[$index]['ignoreErrors'] ) ) { |
| 108 | 108 | $failedOps[$index] = 1; // remember not to call attempt()/finish() |
| 109 | 109 | ++$status->failCount; |
| 110 | | - $status->value[$index] = false; |
| | 110 | + $status->success[$index] = false; |
| 111 | 111 | } else { |
| 112 | 112 | $status->merge( $this->unlockFiles( $filesToLock ) ); |
| 113 | 113 | return $status; |
| — | — | @@ -124,7 +124,7 @@ |
| 125 | 125 | if ( !empty( $ops[$index]['ignoreErrors'] ) ) { |
| 126 | 126 | $failedOps[$index] = 1; // remember not to call finish() |
| 127 | 127 | ++$status->failCount; |
| 128 | | - $status->value[$index] = false; |
| | 128 | + $status->success[$index] = false; |
| 129 | 129 | } else { |
| 130 | 130 | // Revert everything done so far and abort. |
| 131 | 131 | // Do this by reverting each previous operation in reverse order. |
| — | — | @@ -149,10 +149,10 @@ |
| 150 | 150 | $subStatus = $fileOp->finish(); |
| 151 | 151 | if ( $subStatus->isOK() ) { |
| 152 | 152 | ++$status->successCount; |
| 153 | | - $status->value[$index] = true; |
| | 153 | + $status->success[$index] = true; |
| 154 | 154 | } else { |
| 155 | 155 | ++$status->failCount; |
| 156 | | - $status->value[$index] = false; |
| | 156 | + $status->success[$index] = false; |
| 157 | 157 | } |
| 158 | 158 | $status->merge( $subStatus ); |
| 159 | 159 | } |
| Index: branches/FileBackend/phase3/includes/filerepo/backend/FileBackend.php |
| — | — | @@ -441,7 +441,7 @@ |
| 442 | 442 | if ( !empty( $ops[$index]['ignoreErrors'] ) ) { |
| 443 | 443 | $failedOps[$index] = 1; // remember not to call attempt()/finish() |
| 444 | 444 | ++$status->failCount; |
| 445 | | - $status->value[$index] = false; |
| | 445 | + $status->success[$index] = false; |
| 446 | 446 | } else { |
| 447 | 447 | $status->merge( $this->unlockFiles( $filesToLock ) ); |
| 448 | 448 | return $status; |
| — | — | @@ -459,7 +459,7 @@ |
| 460 | 460 | if ( !empty( $ops[$index]['ignoreErrors'] ) ) { |
| 461 | 461 | $failedOps[$index] = 1; // remember not to call finish() |
| 462 | 462 | ++$status->failCount; |
| 463 | | - $status->value[$index] = false; |
| | 463 | + $status->success[$index] = false; |
| 464 | 464 | } else { |
| 465 | 465 | // Revert everything done so far and abort. |
| 466 | 466 | // Do this by reverting each previous operation in reverse order. |
| — | — | @@ -484,10 +484,10 @@ |
| 485 | 485 | $subStatus = $fileOp->finish(); |
| 486 | 486 | if ( $subStatus->isOK() ) { |
| 487 | 487 | ++$status->successCount; |
| 488 | | - $status->value[$index] = true; |
| | 488 | + $status->success[$index] = true; |
| 489 | 489 | } else { |
| 490 | 490 | ++$status->failCount; |
| 491 | | - $status->value[$index] = false; |
| | 491 | + $status->success[$index] = false; |
| 492 | 492 | } |
| 493 | 493 | $status->merge( $subStatus ); |
| 494 | 494 | } |
| Index: branches/FileBackend/phase3/includes/filerepo/FileRepo.php |
| — | — | @@ -808,6 +808,9 @@ |
| 809 | 809 | $status->merge( $this->backend->doOperations( $deleteOperations ) ); |
| 810 | 810 | } |
| 811 | 811 | |
| | 812 | + // Make sure status is OK, despite any $deleteOperations fatals |
| | 813 | + $status->setResult( true ); |
| | 814 | + |
| 812 | 815 | return $status; |
| 813 | 816 | } |
| 814 | 817 | |