Fixed error on unlink when no such file or directory (#2675)

luigifab · web-flow · commit 2d960913aee7 · 2023-01-13T22:51:30.000Z
diff --git a/lib/Varien/Io/File.php b/lib/Varien/Io/File.php
@@ -399,6 +399,7 @@ public function rmdir($dir, $recursive = false)
      */
     public static function rmdirRecursive($dir, $recursive = true)
     {
+        $result = true;
         if ($recursive) {
             if (is_dir($dir)) {
                 foreach (scandir($dir) as $item) {
@@ -408,7 +409,7 @@ public static function rmdirRecursive($dir, $recursive = true)
                     self::rmdirRecursive($dir . "/" . $item, $recursive);
                 }
                 $result = @rmdir($dir);
-            } else {
+            } elseif (file_exists($dir)) {
                 $result = @unlink($dir);
             }
         } else {

Original file line number	Diff line number	Diff line change
`@@ -399,6 +399,7 @@ public function rmdir($dir, $recursive = false)`
`399`	`399`	`*/`
`400`	`400`	`public static function rmdirRecursive($dir, $recursive = true)`
`401`	`401`	`{`
	`402`	`+ $result = true;`
`402`	`403`	`if ($recursive) {`
`403`	`404`	`if (is_dir($dir)) {`
`404`	`405`	`foreach (scandir($dir) as $item) {`
`@@ -408,7 +409,7 @@ public static function rmdirRecursive($dir, $recursive = true)`
`408`	`409`	`self::rmdirRecursive($dir . "/" . $item, $recursive);`
`409`	`410`	`}`
`410`	`411`	`$result = @rmdir($dir);`
`411`		`- } else {`
	`412`	`+ } elseif (file_exists($dir)) {`
`412`	`413`	`$result = @unlink($dir);`
`413`	`414`	`}`
`414`	`415`	`} else {`