Merge branch 'main' into next

empiricompany · Jun 19, 2023 · cc78b50 · cc78b50
2 parents cc8b6c2 + 15f7623
commit cc78b50
Show file tree

Hide file tree

Showing 3 changed files with 75 additions and 67 deletions.
diff --git a/...de/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php b/...de/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
@@ -164,41 +164,46 @@ public function getLinkData()
                 'sample_type' => $item->getSampleType(),
                 'sort_order' => $item->getSortOrder(),
             ];
-            $file = Mage::helper('downloadable/file')->getFilePath(
-                Mage_Downloadable_Model_Link::getBasePath(),
-                $item->getLinkFile()
-            );
-
-            if ($item->getLinkFile() && !is_file($file)) {
-                Mage::helper('core/file_storage_database')->saveFileToFilesystem($file);
-            }
 
-            if ($item->getLinkFile() && is_file($file)) {
-                $name = '<a href="'
-                    . $this->getUrl('*/downloadable_product_edit/link', [
-                        'id' => $item->getId(),
-                        '_secure' => true
-                    ]) . '">' . Mage::helper('downloadable/file')->getFileFromPathFile($item->getLinkFile()) . '</a>';
-                $tmpLinkItem['file_save'] = [
-                    [
-                        'file' => $item->getLinkFile(),
-                        'name' => $name,
-                        'size' => filesize($file),
-                        'status' => 'old'
-                    ]];
+            if ($item->getLinkFile()) {
+                $file = Mage::helper('downloadable/file')->getFilePath(
+                    Mage_Downloadable_Model_Link::getBasePath(),
+                    $item->getLinkFile()
+                );
+                if (!is_file($file)) {
+                    Mage::helper('core/file_storage_database')->saveFileToFilesystem($file);
+                }
+                if (is_file($file)) {
+                    $name = '<a href="'
+                        . $this->getUrl('*/downloadable_product_edit/link', [
+                            'id' => $item->getId(),
+                            '_secure' => true
+                        ]) . '">' . Mage::helper('downloadable/file')->getFileFromPathFile($item->getLinkFile()) . '</a>';
+                    $tmpLinkItem['file_save'] = [
+                        [
+                            'file' => $item->getLinkFile(),
+                            'name' => $name,
+                            'size' => filesize($file),
+                            'status' => 'old'
+                        ]
+                    ];
+                }
             }
-            $sampleFile = Mage::helper('downloadable/file')->getFilePath(
-                Mage_Downloadable_Model_Link::getBaseSamplePath(),
-                $item->getSampleFile()
-            );
-            if ($item->getSampleFile() && is_file($sampleFile)) {
-                $tmpLinkItem['sample_file_save'] = [
-                    [
-                        'file' => $item->getSampleFile(),
-                        'name' => Mage::helper('downloadable/file')->getFileFromPathFile($item->getSampleFile()),
-                        'size' => filesize($sampleFile),
-                        'status' => 'old'
-                    ]];
+            if ($item->getSampleFile()) {
+                $sampleFile = Mage::helper('downloadable/file')->getFilePath(
+                    Mage_Downloadable_Model_Link::getBaseSamplePath(),
+                    $item->getSampleFile()
+                );
+                if (is_file($sampleFile)) {
+                    $tmpLinkItem['sample_file_save'] = [
+                        [
+                            'file' => $item->getSampleFile(),
+                            'name' => Mage::helper('downloadable/file')->getFileFromPathFile($item->getSampleFile()),
+                            'size' => filesize($sampleFile),
+                            'status' => 'old'
+                        ]
+                    ];
+                }
             }
             if ($item->getNumberOfDownloads() == '0') {
                 $tmpLinkItem['is_unlimited'] = ' checked="checked"';

diff --git a/composer.lock b/composer.lock
diff --git a/js/mage/adminhtml/input-counter.js b/js/mage/adminhtml/input-counter.js
@@ -1,5 +1,4 @@
-// https://stackoverflow.com/a/44436408/5703627
-document.observe('dom:loaded', function() {
+window.addEventListener('DOMContentLoaded', function() {
     Element.addMethods({
         // setup once, memorize the counter element and maxLen
         prepare_for_countdown: function(element) {