Skip to content

Commit ac798fa

Browse files
committed
MCLOUD-10279: Added ACSD-50284 patch
1 parent 854a060 commit ac798fa

3 files changed

+26
-1
lines changed

patches.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,7 @@
266266
">=2.4.3 <2.4.4": "MCLOUD-8279__Fixed_currency_displaying_on_product_page__2.4.3.patch"
267267
},
268268
"Fixes the error 'The file can't be deleted. Warning!unlink: No such file or directory' when flushing JS/CSS cache from the Admin": {
269+
">=2.4.0 <2.4.1-p1": "MCLOUD-10279__errors_when_flushing_js_css_cache_from_admin__2.4.0.patch"
269270
">=2.4.1-p1 <2.4.7": "MCLOUD-10279__errors_when_flushing_js_css_cache_from_admin__2.4.4.patch"
270271
}
271272
},
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
diff -Nuar a/vendor/magento/framework/Filesystem/Driver/File.php b/vendor/magento/framework/Filesystem/Driver/File.php
2+
index 1affad552137..4edb095f6c48 100644
3+
--- a/vendor/magento/framework/Filesystem/Driver/File.php
4+
+++ b/vendor/magento/framework/Filesystem/Driver/File.php
5+
@@ -391,8 +391,8 @@ public function symlink($source, $destination, DriverInterface $targetDriver = n
6+
*/
7+
public function deleteFile($path)
8+
{
9+
- $result = @unlink($this->getScheme() . $path);
10+
- if (!$result) {
11+
+ @unlink($this->getScheme() . $path);
12+
+ if ($this->isFile($path)) {
13+
throw new FileSystemException(
14+
new Phrase(
15+
'The "%1" file can\'t be deleted. %2',
16+
@@ -400,7 +400,7 @@ public function deleteFile($path)
17+
)
18+
);
19+
}
20+
- return $result;
21+
+ return true;
22+
}
23+
24+
/**

patches/MCLOUD-10279__errors_when_flushing_js_css_cache_from_admin__2.4.4.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
diff --git a/vendor/magento/framework/Filesystem/Driver/File.php b/vendor/magento/framework/Filesystem/Driver/File.php
1+
diff -Nuar a/vendor/magento/framework/Filesystem/Driver/File.php b/vendor/magento/framework/Filesystem/Driver/File.php
22
index 5dcfeeef23ab..e26acb5a9369 100644
33
--- a/vendor/magento/framework/Filesystem/Driver/File.php
44
+++ b/vendor/magento/framework/Filesystem/Driver/File.php

0 commit comments

Comments
 (0)