Changeset 18844


Ignore:
Timestamp:
2010/10/02 14:23:14 (12 years ago)
Author:
Seasoft
Message:

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

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

Legend:

Unmodified
Added
Removed
  • branches/version-2_5-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_CSV.php

    r18842 r18844  
    118118 
    119119        if (!isset($arrSelected['no'])) $arrSelected['no'] = array(); 
    120         if (!isset($arrSelected['disp_name'])) $arrSelected['disp_name'] = array(); 
    121120 
    122121        $this->arrSelected = $arrSelected['no']; 
    123122 
    124         // 非出力項目の取得 
    125         $arrChoice = SC_Utils_Ex::sfSwapArray($objCSV->sfgetCsvOutput($subno_id, 'status = 2')); 
     123        // 項目の取得 
     124        $arrOptions = SC_Utils_Ex::sfSwapArray($objCSV->sfgetCsvOutput($subno_id)); 
    126125 
    127         if (!isset($arrChoice['no'])) $arrChoice['no'] = array(); 
    128         if (!isset($arrChoice['disp_name'])) $arrChoice['disp_name'] = array(); 
     126        if (!isset($arrOptions['no'])) $arrOptions['no'] = array(); 
     127        if (!isset($arrOptions['disp_name'])) $arrOptions['disp_name'] = array(); 
    129128 
    130         $arrOptions = array_merge( 
    131             SC_Utils_Ex::sfarrCombine($arrSelected['no'], $arrSelected['disp_name']), 
    132             SC_Utils_Ex::sfarrCombine($arrChoice['no'], $arrChoice['disp_name']) 
    133         ); 
     129        $arrOptions = SC_Utils_Ex::sfarrCombine($arrOptions['no'], $arrOptions['disp_name']); 
    134130 
    135131        $this->arrOptions = $arrOptions; 
Note: See TracChangeset for help on using the changeset viewer.