Changeset 22739 for branches/version-2_13-dev/data/class/pages/admin

Timestamp:

2013/03/22 11:07:49 (14 years ago)

Author:

Seasoft

Message:

#1710 (SC_Helper_CSV#sfDownloadCsv 第4引数($order)が無効となるケースがある)

• 個別処理の統合

Location:

branches/version-2_13-dev/data/class/pages/admin

Files:

• customer/LC_Page_Admin_Customer.php (modified) (1 diff)
• order/LC_Page_Admin_Order.php (modified) (1 diff)
• products/LC_Page_Admin_Products_Review.php (modified) (1 diff)

branches/version-2_13-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer.php

@@ -230 +230 @@
     {
         $objSelect = new SC_CustomerList_Ex($arrParam, 'customer');
+        $objCSV = new SC_Helper_CSV_Ex();
+
         $order = 'update_date DESC, customer_id DESC';
 
-        $objCSV = new SC_Helper_CSV_Ex();
         list($where, $arrVal) = $objSelect->getWhere();
         return $objCSV->sfDownloadCsv('2', $where, $arrVal, $order, true);

branches/version-2_13-dev/data/class/pages/admin/order/LC_Page_Admin_Order.php

@@ -440 +440 @@
     function doOutputCSV($where, $arrVal, $order)
     {
-        if ($where != '') {
-            $where = " WHERE $where ";
-        }
-
         $objCSV = new SC_Helper_CSV_Ex();
         $objCSV->sfDownloadCsv('3', $where, $arrVal, $order, true);

branches/version-2_13-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Review.php

@@ -250 +250 @@
     {
         $objCSV = new SC_Helper_CSV_Ex();
-        if ($where != '') {
-            $where = 'WHERE ' . $where;
-        }
         $objCSV->sfDownloadCsv('4', $where, $arrWhereVal, '', true);
     }