Use FileOp when file exists ($this->backend has a null reference)
authorMarkus Glaser <mglaser@users.mediawiki.org>
Tue, 3 Jan 2012 00:53:01 +0000 (00:53 +0000)
committerMarkus Glaser <mglaser@users.mediawiki.org>
Tue, 3 Jan 2012 00:53:01 +0000 (00:53 +0000)
includes/filerepo/backend/FileBackend.php

index 053662b..37ae399 100644 (file)
@@ -585,12 +585,12 @@ abstract class FileBackend extends FileBackendBase {
         */
        protected function doMoveInternal( array $params ) {
                // Copy source to dest
-               $status = $this->backend->doCopyInternal( $params );
+               $status = $this->copy( $params );
                if ( !$status->isOK() ) {
                        return $status;
                }
                // Delete source (only fails due to races or medium going down)
-               $status->merge( $this->backend->doDeleteInternal( array( 'src' => $params['src'] ) ) );
+               $status->merge( $this->delete( array( 'src' => $params['src'] ) ) );
                $status->setResult( true, $status->value ); // ignore delete() errors
                return $status;
        }