From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 10 Sep 2019 03:37:43 +0000 (+0000)
Subject: Merge "filebackend: remove unneeded is_dir() call in FSFileBackend::doCleanInternal()"
X-Git-Tag: 1.34.0-rc.0~292
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=a90db300ad9b88ae6670244f6ce073aefb7a8364;hp=339a7c13003d8fcd8ccafd55559fc19cdaef3f11

Merge "filebackend: remove unneeded is_dir() call in FSFileBackend::doCleanInternal()"
---

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;