Merge branch 'main' into typos

OpenMage · Sep 17, 2024 · db42f96 · db42f96
2 parents 49c6711 + 22c15d7
commit db42f96
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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

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
@@ -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']);
         }