Merge branch 'main' into next

empiricompany · Jun 7, 2023 · b478bde · b478bde
2 parents a1a66eb + 2f606b9
commit b478bde
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -148,7 +148,7 @@ git init
 git remote add origin https://github.com/<YOUR GIT USERNAME>/magento-lts
 git pull origin main
 git remote add upstream https://github.com/OpenMage/magento-lts
-git pull upstream 1.9.4.x
+git pull upstream main
 git add -A && git commit
 ```
 

diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav/Source.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav/Source.php
@@ -228,7 +228,7 @@ protected function _prepareMultiselectIndex($entityIds = null, $attributeId = nu
         $data  = [];
         $query = $select->query();
         while ($row = $query->fetch()) {
-            $values = array_unique(explode(',', $row['value']));
+            $values = empty($row['value']) ? [] : array_unique(explode(',', $row['value']));
             foreach ($values as $valueId) {
                 if (isset($options[$row['attribute_id']][$valueId])) {
                     $data[] = [

diff --git a/app/code/core/Mage/Core/Model/Resource/Helper/Abstract.php b/app/code/core/Mage/Core/Model/Resource/Helper/Abstract.php
@@ -299,7 +299,7 @@ public function convertOldColumnDefinition($column)
             'unsigned' => $column['unsigned'],
             'nullable' => $column['is_null'],
             'default'  => $column['default'],
-            'identity' => stripos($column['extra'], 'auto_increment') !== false
+            'identity' => !empty($column['extra']) && (stripos($column['extra'], 'auto_increment') !== false),
         ];
 
         /**