Changeset 21400 for branches/version-2_11-dev/data/class

Timestamp:

2012/01/17 16:03:47 (15 years ago)

Author:

Seasoft

Message:

2.12系へマイルストーン変更となったチケット分を差し戻し
r21388 #1593
r21387 #1592
r21386 #1591
r21384 #1589,#1588
r21383 #1580

Location:

branches/version-2_11-dev/data/class

Files:

• SC_Initial.php (modified) (1 diff)
• SC_Product.php (modified) (2 diffs)
• pages/products/LC_Page_Products_List.php (modified) (1 diff)

branches/version-2_11-dev/data/class/SC_Initial.php

@@ -113 +113 @@
      */
     function phpconfigInit() {
+        // E_DEPRECATED 定数 (for PHP < 5.3)
+        // TODO バージョン互換処理に統合したい。
+        $this->defineIfNotDefined('E_DEPRECATED', 8192);
+
+        // エラーレベル設定
+        // 開発時は E_ALL を推奨
+        error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED);
+
         ini_set('display_errors', '1');
         ini_set('html_errors', '1');

branches/version-2_11-dev/data/class/SC_Product.php

@@ -74 +74 @@
     function findProductIdsOrder(&$objQuery, $arrVal = array()) {
         $table = <<< __EOS__
-            dtb_products AS alldtl
-            LEFT JOIN dtb_products_class
-                ON alldtl.product_id = dtb_products_class.product_id
-            LEFT JOIN dtb_product_categories
-                ON alldtl.product_id = dtb_product_categories.product_id
+                 dtb_products AS alldtl
+            JOIN dtb_products_class AS T1
+              ON alldtl.product_id = T1.product_id
+            JOIN dtb_product_categories AS T2
+              ON alldtl.product_id = T2.product_id
+            JOIN dtb_category
+              ON T2.category_id = dtb_category.category_id
 __EOS__;
         $objQuery->setGroupBy('alldtl.product_id');
@@ -117 +119 @@
     function findProductCount(&$objQuery, $arrVal = array()) {
         $table = <<< __EOS__
-            dtb_products AS alldtl
-            LEFT JOIN dtb_products_class
-                ON alldtl.product_id = dtb_products_class.product_id
-            LEFT JOIN dtb_product_categories
-                ON alldtl.product_id = dtb_product_categories.product_id
+                 dtb_products AS alldtl
+            JOIN dtb_product_categories AS T2
+              ON alldtl.product_id = T2.product_id
+            JOIN dtb_category
+              ON T2.category_id = dtb_category.category_id
 __EOS__;
         $objQuery->setGroupBy('alldtl.product_id');

branches/version-2_11-dev/data/class/pages/products/LC_Page_Products_List.php

@@ -425 +425 @@
 
         if (strlen($searchCondition["where_category"]) >= 1) {
-            $searchCondition['where'] .= " AND dtb_product_categories.".$searchCondition["where_category"];
+            $searchCondition['where'] .= " AND T2.".$searchCondition["where_category"];
             $searchCondition['arrval'] = array_merge($searchCondition['arrval'], $searchCondition['arrvalCategory']);
         }