https://www.mediawiki.org/wiki/Special:Code/MediaWiki/106670
Revision: 106670
Author: aaron
Date: 2011-12-19 18:26:51 +0000 (Mon, 19 Dec 2011)
Log Message:
-----------
* Fixed bogus var in doMove() and at least add delete() errors to status
* Comment tweaks
Modified Paths:
--------------
branches/FileBackend/phase3/includes/filerepo/backend/FSFileBackend.php
branches/FileBackend/phase3/includes/filerepo/backend/FileBackend.php
branches/FileBackend/phase3/includes/filerepo/backend/FileBackendMultiWrite.php
Modified:
branches/FileBackend/phase3/includes/filerepo/backend/FSFileBackend.php
===================================================================
--- branches/FileBackend/phase3/includes/filerepo/backend/FSFileBackend.php
2011-12-19 18:25:00 UTC (rev 106669)
+++ branches/FileBackend/phase3/includes/filerepo/backend/FSFileBackend.php
2011-12-19 18:26:51 UTC (rev 106670)
@@ -558,6 +558,8 @@
/**
* Wrapper around RecursiveDirectoryIterator that catches
* exception or does any custom behavoir that we may want.
+ *
+ * @ingroup FileBackend
*/
class FSFileIterator implements Iterator {
/** @var RecursiveIteratorIterator */
Modified: branches/FileBackend/phase3/includes/filerepo/backend/FileBackend.php
===================================================================
--- branches/FileBackend/phase3/includes/filerepo/backend/FileBackend.php
2011-12-19 18:25:00 UTC (rev 106669)
+++ branches/FileBackend/phase3/includes/filerepo/backend/FileBackend.php
2011-12-19 18:26:51 UTC (rev 106670)
@@ -451,7 +451,8 @@
return $status;
}
// Delete source (only fails due to races or medium going down)
- $this->backend->delete( array( 'src' => $this->params['src'] )
);
+ $status->merge( $this->backend->delete( array( 'src' =>
$params['src'] ) ) );
+ $status->setResult( true, $status->value ); // ignore delete()
errors
return $status;
}
Modified:
branches/FileBackend/phase3/includes/filerepo/backend/FileBackendMultiWrite.php
===================================================================
---
branches/FileBackend/phase3/includes/filerepo/backend/FileBackendMultiWrite.php
2011-12-19 18:25:00 UTC (rev 106669)
+++
branches/FileBackend/phase3/includes/filerepo/backend/FileBackendMultiWrite.php
2011-12-19 18:26:51 UTC (rev 106670)
@@ -42,6 +42,8 @@
*/
public function __construct( array $config ) {
parent::__construct( $config );
+ // Construct backends here rather than via registration
+ // to keep these backends hidden from outside the proxy.
foreach ( $config['backends'] as $index => $config ) {
if ( !isset( $config['class'] ) ) {
throw new MWException( 'No class given for a
backend config.' );
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
