From: Aaron Schulz <aschulz@wikimedia.org>
Date: Sun, 8 Sep 2019 21:39:52 +0000 (-0700)
Subject: filebackend: remove unneeded is_dir() call in FSFileBackend::doCleanInternal()
X-Git-Tag: 1.34.0-rc.0~292^2
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=e021adabb97dc12a41c6fd5ce50bd9e0851c8823

filebackend: remove unneeded is_dir() call in FSFileBackend::doCleanInternal()

Change-Id: Ia630e2052edd31f0d9b6ed7068497dc4ae66d917
---

diff --git a/includes/libs/filebackend/FSFileBackend.php b/includes/libs/filebackend/FSFileBackend.php
index 5534cbd710..9ed7ae3426 100644
--- a/includes/libs/filebackend/FSFileBackend.php
+++ b/includes/libs/filebackend/FSFileBackend.php
@@ -556,9 +556,7 @@ class FSFileBackend extends FileBackendStore {
 		$contRoot = $this->containerFSRoot( $shortCont, $fullCont ); // must be valid
 		$dir = ( $dirRel != '' ) ? "{$contRoot}/{$dirRel}" : $contRoot;
 		AtEase::suppressWarnings();
-		if ( is_dir( $dir ) ) {
-			rmdir( $dir ); // remove directory if empty
-		}
+		rmdir( $dir ); // remove directory if empty
 		AtEase::restoreWarnings();
 
 		return $status;