X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Flibs%2Ffilebackend%2Ffileop%2FDeleteFileOp.php;h=3b48881e72201afe6a65c7f4a8a2eb692b7f0e8e;hb=5a451fd01be397db3209c1881a335423706da5c2;hp=01f7df46a83c3ae077c6d4fb3f41c0f3d293aea9;hpb=8e185ecb2b53217665ea53f63119a28b3f80ff56;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/libs/filebackend/fileop/DeleteFileOp.php b/includes/libs/filebackend/fileop/DeleteFileOp.php
index 01f7df46a8..3b48881e72 100644
--- a/includes/libs/filebackend/fileop/DeleteFileOp.php
+++ b/includes/libs/filebackend/fileop/DeleteFileOp.php
@@ -1,25 +1,25 @@
 <?php
 /**
-* Helper class for representing operations with transaction support.
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License along
-* with this program; if not, write to the Free Software Foundation, Inc.,
-* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-* http://www.gnu.org/copyleft/gpl.html
-*
-* @file
-* @ingroup FileBackend
-*/
+ * Helper class for representing operations with transaction support.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup FileBackend
+ */
 
 /**
  * Delete a file at the given storage path from the backend.
@@ -32,8 +32,10 @@ class DeleteFileOp extends FileOp {
 
 	protected function doPrecheck( array &$predicates ) {
 		$status = StatusValue::newGood();
-		// Check if the source file exists
-		if ( !$this->fileExists( $this->params['src'], $predicates ) ) {
+
+		// Check source file existence
+		$srcExists = $this->fileExists( $this->params['src'], $predicates );
+		if ( $srcExists === false ) {
 			if ( $this->getParam( 'ignoreMissingSource' ) ) {
 				$this->doOperation = false; // no-op
 				// Update file existence predicates (cache 404s)
@@ -46,10 +48,8 @@ class DeleteFileOp extends FileOp {
 
 				return $status;
 			}
-			// Check if a file can be placed/changed at the source
-		} elseif ( !$this->backend->isPathUsableInternal( $this->params['src'] ) ) {
-			$status->fatal( 'backend-fail-usable', $this->params['src'] );
-			$status->fatal( 'backend-fail-delete', $this->params['src'] );
+		} elseif ( $srcExists === FileBackend::EXISTENCE_ERROR ) {
+			$status->fatal( 'backend-fail-stat', $this->params['src'] );
 
 			return $status;
 		}