[Svn-src-all:4288] [version-2_13_0 23202] #2116 仮登録メール再送で会員登録完了メールが送信されます mishap with character

[michael_nelson]

Subversion committed to /home/svn/open 23202
http://svn.ec-cube.net/open_trac/changeset/23202
┌────────────────────────────┐
│更新者　:  michael_nelson                               │
│更新日時:  2013-09-09 17:41:09 +0900 (月, 09  9月 2013)│
└────────────────────────────┘

Log:
--------------------------------------------------------
#2116 仮登録メール再送で会員登録完了メールが送信されます mishap with character 

Changed:                      [U:修正，A:追加，D:削除]
--------------------------------------------------------
U   branches/version-2_13_0/data/class/helper/SC_Helper_Mail.php
U   branches/version-2_13_0/data/class/pages/admin/customer/LC_Page_Admin_Customer.php

変更: branches/version-2_13_0/data/class/helper/SC_Helper_Mail.php
===================================================================
--- branches/version-2_13_0/data/class/helper/SC_Helper_Mail.php	2013-09-09 07:38:31 UTC (rev 23201)
+++ branches/version-2_13_0/data/class/helper/SC_Helper_Mail.php	2013-09-09 08:41:09 UTC (rev 23202)
@@ -317,7 +317,9 @@
      * @param  string  $secret_key  会員固有キー
      * @param  integer $customer_id 会員ID
      * @param  boolean $is_mobile   false(default):PCアドレスにメールを送る true:携帯アドレスにメールを送る
+     * @param $resend_flg true  仮登録メール再送
      * @return boolean true:成功 false:失敗
+     *  
      */
     public function sfSendRegistMail($secret_key, $customer_id = '', $is_mobile = false, $resend_flg = false)
     {
@@ -343,9 +345,8 @@
         $objMailText->assignobj($this);
 
         $objHelperMail  = new SC_Helper_Mail_Ex();
-
         // 仮会員が有効の場合    
-        if (CUSTOMER_CONFIRM_MAIL == true and $arrCustomerData['status'] == 1 or $arrCustomerData['status'] == 1 and $resend_flg = true) {
+        if (CUSTOMER_CONFIRM_MAIL == true and $arrCustomerData['status'] == 1 or $arrCustomerData['status'] == 1 and $resend_flg == true) {
             $subject        = $objHelperMail->sfMakeSubject('会員登録のご確認', $objMailText);
             $toCustomerMail = $objMailText->fetch('mail_templates/customer_mail.tpl');
         } else {

変更: branches/version-2_13_0/data/class/pages/admin/customer/LC_Page_Admin_Customer.php
===================================================================
--- branches/version-2_13_0/data/class/pages/admin/customer/LC_Page_Admin_Customer.php	2013-09-09 07:38:31 UTC (rev 23201)
+++ branches/version-2_13_0/data/class/pages/admin/customer/LC_Page_Admin_Customer.php	2013-09-09 08:41:09 UTC (rev 23202)
@@ -191,7 +191,7 @@
         // 登録メール再送
         $objHelperMail = new SC_Helper_Mail_Ex();
         $objHelperMail->setPage($this);
-        $objHelperMail->sfSendRegistMail($arrData['secret_key'], $customer_id, $resend_flg);
+        $objHelperMail->sfSendRegistMail($arrData['secret_key'], $customer_id, null, $resend_flg);
         return true;
     }