From: Markus Glaser <mglaser@users.mediawiki.org>
Date: Tue, 3 Jan 2012 00:53:01 +0000 (+0000)
Subject: Use FileOp when file exists ($this->backend has a null reference)
X-Git-Tag: 1.31.0-rc.0~25604
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/pie.php?a=commitdiff_plain;h=adb986de9e01a928d2b7d3497af16722f534301a;p=lhc%2Fweb%2Fwiklou.git

Use FileOp when file exists ($this->backend has a null reference)
---

diff --git a/includes/filerepo/backend/FileBackend.php b/includes/filerepo/backend/FileBackend.php
index 053662b4c2..37ae39995b 100644
--- a/includes/filerepo/backend/FileBackend.php
+++ b/includes/filerepo/backend/FileBackend.php
@@ -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;
 	}