Changeset 18844 for branches/version-2_5-dev

Timestamp:

2010/10/02 14:23:14 (16 years ago)

Author:

Seasoft

Message:

#824(CSV出力項目設定の並び順変更で異常表示)改修

• r18842 で発生した無駄な処理を削除。

File:

• branches/version-2_5-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_CSV.php (modified) (1 diff)

branches/version-2_5-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_CSV.php

@@ -118 +118 @@
 
         if (!isset($arrSelected['no'])) $arrSelected['no'] = array();
-        if (!isset($arrSelected['disp_name'])) $arrSelected['disp_name'] = array();
 
         $this->arrSelected = $arrSelected['no'];
 
-        // 非出力項目の取得
-        $arrChoice = SC_Utils_Ex::sfSwapArray($objCSV->sfgetCsvOutput($subno_id, 'status = 2'));
+        // 全項目の取得
+        $arrOptions = SC_Utils_Ex::sfSwapArray($objCSV->sfgetCsvOutput($subno_id));
 
-        if (!isset($arrChoice['no'])) $arrChoice['no'] = array();
-        if (!isset($arrChoice['disp_name'])) $arrChoice['disp_name'] = array();
+        if (!isset($arrOptions['no'])) $arrOptions['no'] = array();
+        if (!isset($arrOptions['disp_name'])) $arrOptions['disp_name'] = array();
 
-        $arrOptions = array_merge(
-            SC_Utils_Ex::sfarrCombine($arrSelected['no'], $arrSelected['disp_name']),
-            SC_Utils_Ex::sfarrCombine($arrChoice['no'], $arrChoice['disp_name'])
-        );
+        $arrOptions = SC_Utils_Ex::sfarrCombine($arrOptions['no'], $arrOptions['disp_name']);
 
         $this->arrOptions = $arrOptions;