| Index: branches/FileBackend/phase3/includes/filerepo/backend/FileBackendMultiWrite.php |
| — | — | @@ -42,6 +42,8 @@ |
| 43 | 43 | */ |
| 44 | 44 | public function __construct( array $config ) { |
| 45 | 45 | parent::__construct( $config ); |
| | 46 | + // Construct backends here rather than via registration |
| | 47 | + // to keep these backends hidden from outside the proxy. |
| 46 | 48 | foreach ( $config['backends'] as $index => $config ) { |
| 47 | 49 | if ( !isset( $config['class'] ) ) { |
| 48 | 50 | throw new MWException( 'No class given for a backend config.' ); |
| Index: branches/FileBackend/phase3/includes/filerepo/backend/FSFileBackend.php |
| — | — | @@ -558,6 +558,8 @@ |
| 559 | 559 | /** |
| 560 | 560 | * Wrapper around RecursiveDirectoryIterator that catches |
| 561 | 561 | * exception or does any custom behavoir that we may want. |
| | 562 | + * |
| | 563 | + * @ingroup FileBackend |
| 562 | 564 | */ |
| 563 | 565 | class FSFileIterator implements Iterator { |
| 564 | 566 | /** @var RecursiveIteratorIterator */ |
| Index: branches/FileBackend/phase3/includes/filerepo/backend/FileBackend.php |
| — | — | @@ -451,7 +451,8 @@ |
| 452 | 452 | return $status; |
| 453 | 453 | } |
| 454 | 454 | // Delete source (only fails due to races or medium going down) |
| 455 | | - $this->backend->delete( array( 'src' => $this->params['src'] ) ); |
| | 455 | + $status->merge( $this->backend->delete( array( 'src' => $params['src'] ) ) ); |
| | 456 | + $status->setResult( true, $status->value ); // ignore delete() errors |
| 456 | 457 | return $status; |
| 457 | 458 | } |
| 458 | 459 | |