From ee26c87dff234f9e2a80d8a00ad81b351d77385e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 Sep 2024 00:19:49 +0200 Subject: [PATCH 1/2] Bump peter-evans/create-pull-request from 6 to 7 (#4193) Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 6 to 7. - [Release notes](https://github.com/peter-evans/create-pull-request/releases) - [Commits](https://github.com/peter-evans/create-pull-request/compare/v6...v7) --- updated-dependencies: - dependency-name: peter-evans/create-pull-request dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/update-copyright.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-copyright.yml b/.github/workflows/update-copyright.yml index 5bab98610f6..438a6c71db4 100644 --- a/.github/workflows/update-copyright.yml +++ b/.github/workflows/update-copyright.yml @@ -43,7 +43,7 @@ jobs: run: php -f shell/update-copyright.php - name: Create Pull Request - uses: peter-evans/create-pull-request@v6 + uses: peter-evans/create-pull-request@v7 with: commit-message: update copyright title: Updated Copyright From 22c15d73d593dfea8b4daf43767d39ca8b1dcf9b Mon Sep 17 00:00:00 2001 From: S0FTWEX <35923501+S0FTWEX@users.noreply.github.com> Date: Tue, 17 Sep 2024 01:26:44 +0200 Subject: [PATCH 2/2] Fixed undefined array key "values" in Mage_Catalog_Model_Product_Attribute_Backend_Media (#4125) * Removed 'includes' folder Removed unnecessary 'includes' folder, because Compiler was removed lately * Fixed PHP8 ArgumentCountError with Mage_ConfigurableSwatches enabled. * Revert "Removed 'includes' folder" This reverts commit 18ff2d64d7e631e666a4eac2d6867182a3e4040e. * Fixed undefined array key "values" in Backend Media fix undefined array key "values" in /app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php on line 113 and fixed foreach() argument must be of type array|object, null given in /app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php on line 167 * Added check for isModuleOutputEnabled('Mage_AdminNotification') * Revert "Added check for isModuleOutputEnabled('Mage_AdminNotification')" This reverts commit 8685a124b4d4d314919f38d4de72716b19e079d4. --------- Co-authored-by: Sven Reichel Co-authored-by: Ng Kiat Siong --- .../Mage/Catalog/Model/Product/Attribute/Backend/Media.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php index 40439265b68..6f2636cb986 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php @@ -110,6 +110,10 @@ public function beforeSave($object) $value['images'] = Mage::helper('core')->jsonDecode($value['images']); } + if (!isset($value['values'])) { + $value['values'] = []; + } + if (!is_array($value['values']) && strlen($value['values']) > 0) { $value['values'] = Mage::helper('core')->jsonDecode($value['values']); }