[Svn-src-all:1371] [version-2_5-dev 20261] refs #965

[shutta]

Subversion committed to /home/svn/open 20261
http://svn.ec-cube.net/open_trac/changeset/20261
┌────────────────────────────┐
│更新者　:  shutta                                       │
│更新日時:  2011-02-20 19:42:53 +0900 (日, 20  2月 2011)│
└────────────────────────────┘

Log:
--------------------------------------------------------
refs #965
メールマガジンの送付オプションの選択肢を修正。
mtb_magazine_typeじゃなくて、mtb_mail_magazine_typeを参照するのが正しいはず。


Changed:                      [U:修正，A:追加，D:削除]
--------------------------------------------------------
U   branches/version-2_5-dev/data/Smarty/templates/admin/customer/edit.tpl
U   branches/version-2_5-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer_Edit.php

変更: branches/version-2_5-dev/data/Smarty/templates/admin/customer/edit.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/customer/edit.tpl	2011-02-20 10:36:40 UTC (rev 20260)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/customer/edit.tpl	2011-02-20 10:42:53 UTC (rev 20261)
@@ -214,7 +214,7 @@
                 <td>
                     <span class="attention"><!--{$arrErr.mailmaga_flg}--></span>
                     <span <!--{if $arrErr.mailmaga_flg != ""}--><!--{sfSetErrorStyle}--><!--{/if}-->>
-                        <!--{html_radios name="mailmaga_flg" options=$arrMagazineType separator=" " selected=$arrForm.mailmaga_flg}-->
+                        <!--{html_radios name="mailmaga_flg" options=$arrMailMagazineType separator=" " selected=$arrForm.mailmaga_flg}-->
                     </span>
                 </td>
             </tr>

変更: branches/version-2_5-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer_Edit.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer_Edit.php	2011-02-20 10:36:40 UTC (rev 20260)
+++ branches/version-2_5-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer_Edit.php	2011-02-20 10:42:53 UTC (rev 20261)
@@ -56,7 +56,7 @@
         $this->arrSex = $masterData->getMasterData("mtb_sex");
         $this->arrReminder = $masterData->getMasterData("mtb_reminder");
         $this->arrStatus = $masterData->getMasterData("mtb_customer_status");
-        $this->arrMagazineType = $masterData->getMasterData("mtb_magazine_type");
+        $this->arrMailMagazineType = $masterData->getMasterData("mtb_mail_magazine_type");
 
         // 日付プルダウン設定
         $objDate = new SC_Date(BIRTH_YEAR);