Changeset 21324

Timestamp:

2011/11/10 22:23:33 (12 years ago)

Author:

Seasoft

Message:

#1547 (SC_Helper_DB#sfCountCategory 抽出条件の重複指定の懸念)
#1546 (SC_Helper_DB#sfCountCategory dtb_category_total_count の算出で在庫の有無を考慮できない)

• 演算子の優先順位を誤り不適当な実装となっていた。#1547 の改訂で偶然改修された。新たな実装誤りを防ぐため、括弧で明示した。

File:

• branches/version-2_11-dev/data/class/helper/SC_Helper_DB.php (modified) (2 diffs)

branches/version-2_11-dev/data/class/helper/SC_Helper_DB.php

@@ -657 +657 @@
         // 在庫無し商品の非表示
         if (NOSTOCK_HIDDEN) {
-            $sql_where_dtl = 'stock >= 1 OR stock_unlimited = 1';
+            $sql_where_dtl = '(stock >= 1 OR stock_unlimited = 1)';
             $from = $objProduct->alldtlSQL($sql_where_dtl);
         }else{
@@ -773 +773 @@
             $where = "($sql_where) AND ($sql_where_product_ids)";
 
+            $where_products_class = '';
             if (NOSTOCK_HIDDEN) {
-                $sql_where_product_ids .= ' AND stock >= 1 OR stock_unlimited = 1';
-            }
-
-            $from = $objProduct->alldtlSQL($sql_where_product_ids);
+                $where_products_class .= '(stock >= 1 OR stock_unlimited = 1)';
+            }
+
+            $from = $objProduct->alldtlSQL($where_products_class);
             $sql = "SELECT count(*) FROM $from WHERE $where ";
             $arrUpdateData[ $category_id ] = $objQuery->getOne($sql, $arrval);