optimize existing visibilities

lewisvoncken · Jul 18, 2018 · ba2c7ae · ba2c7ae
1 parent 6386268
commit ba2c7ae
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/Model/Resource/Storage/UrlRewriteStorage.php b/Model/Resource/Storage/UrlRewriteStorage.php
@@ -74,15 +74,11 @@ public function updateRewritesByProductIds(array $productIds, array $storeViewId
 
                 $productCategoryIds = array_key_exists($productId, $allProductCategoryIds) ? $allProductCategoryIds[$productId] : [];
 
-                if (isset($allVisibilities[$productId][$storeViewId])) {
-                    $visibility = $allVisibilities[$productId][$storeViewId];
-                } elseif (isset($allVisibilities[$productId][0])) {
-                    $visibility = $allVisibilities[$productId][0];
+                if (isset($allVisibilities[$productId])) {
+                    if ($allVisibilities[$productId] === ProductStoreView::VISIBILITY_NOT_VISIBLE) {
+                        continue;
+                    }
                 } else {
-                    $visibility = null;
-                }
-
-                if ($visibility === null || $visibility === ProductStoreView::VISIBILITY_NOT_VISIBLE) {
                     continue;
                 }
 
@@ -201,11 +197,12 @@ protected function getExistingVisibilities(array $productIds)
             FROM `{$this->metaData->productEntityTable}_int`
             WHERE `entity_id` IN (" . $this->db->getMarks($productIds) . ") AND
                 attribute_id = ?
+            ORDER BY `store_id` ASC    
         ", array_merge($productIds, [$attributeId]));
 
         $visibilities = [];
         foreach ($rows as $row) {
-            $visibilities[(int)$row['entity_id']][(int)$row['store_id']] = (int)$row['value'];
+            $visibilities[(int)$row['entity_id']] = (int)$row['value'];
         }
 
         return $visibilities;