Changeset 20469

Timestamp:

2011/03/03 15:13:48 (13 years ago)

Author:

nanasess

bzr:base-revision:

ohkouchi@loop-az.jp-20110303044131-gtuix3tjxo2msrec

bzr:committer:

Kentaro Ohkouchi <ohkouchi@loop-az.jp>

bzr:file-ids:

data/class/helper/SC_Helper_Mail.php 15618@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fhelper%2FSC_Helper_Mail.php

bzr:mapping-version:

v4

bzr:merge:

ohkouchi@loop-az.jp-20110303061109-3fk7ffq5l1xzdo6h

bzr:repository-uuid:

1e3b908f-19a9-db11-a64c-001125224ba8

bzr:revision-id:

ohkouchi@loop-az.jp-20110303061332-53ryq3uskox7e60i

bzr:revno:

3196

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-revisions:

data/class/helper/SC_Helper_Mail.php ohkouchi@loop-az.jp-20110303061109-3fk7ffq5l1xzdo6h

bzr:timestamp:

2011-03-03 15:13:32.509000063 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2011-03-03T06:13:32.509000Z

Message:

#622(モバイルサイト 受注メール Subject テンプレートがPCサイト用を参照している)

File:

• branches/version-2_5-dev/data/class/helper/SC_Helper_Mail.php (modified) (5 diffs)

branches/version-2_5-dev/data/class/helper/SC_Helper_Mail.php

@@ -67 +67 @@
         if ($reply_to == "") $reply_to = $arrInfo['email03'];
         $error = $arrInfo['email04'];
-        $tosubject = $this->sfMakeSubject($tmp_subject);
+        $tosubject = $this->sfMakeSubject($tmp_subject, $objMailView);
         
         $objSendMail->setItem('', $tosubject, $body, $from_address, $from_name, $reply_to, $error, $error);
@@ -164 +164 @@
         $from = $arrInfo['email03'];
         $error = $arrInfo['email04'];
-        $tosubject = $this->sfMakeSubject($tmp_subject);
+        $tosubject = $this->sfMakeSubject($tmp_subject, $objMailView);
 
         $objSendMail->setItem('', $tosubject, $body, $from, $arrInfo['shop_name'], $from, $error, $error, $bcc);
@@ -194 +194 @@
         $from = $arrInfo['email03'];
         $error = $arrInfo['email04'];
-        $tosubject = $this->sfMakeSubject($tmp_subject);
+        $tosubject = $this->sfMakeSubject($tmp_subject, $objMailView);
         
         $objSendMail->setItem($to, $tosubject, $body, $from, $arrInfo['shop_name'], $from, $error, $error, $bcc);
@@ -215 +215 @@
 
     //件名にテンプレートを用いる
-    function sfMakeSubject($subject) {
-        $objQuery = new SC_Query();
-        $objMailView = new SC_SiteView_Ex();
+    function sfMakeSubject($subject, &$objMailView) {
+        if (empty($objMailView)) {
+            $objMailView = new SC_SiteView_Ex();
+        }
         $objTplAssign = new stdClass;
         
-        $arrInfo = $objQuery->select("*","dtb_baseinfo");
-        $arrInfo = $arrInfo[0];
+        $arrInfo = SC_Helper_DB_Ex::sfGetBasisData();
         $objTplAssign->tpl_shopname=$arrInfo['shop_name'];
         $objTplAssign->tpl_infoemail=$subject; // 従来互換
@@ -296 +296 @@
         // 仮会員が有効の場合
         if(CUSTOMER_CONFIRM_MAIL == true and $arrCustomerData['status'] == 1) {
-            $subject        = $objHelperMail->sfMakeSubject('会員登録のご確認');
+            $subject        = $objHelperMail->sfMakeSubject('会員登録のご確認', $objMailText);
             $toCustomerMail = $objMailText->fetch("mail_templates/customer_mail.tpl");
         } else {
-            $subject        = $objHelperMail->sfMakeSubject('会員登録のご完了');
+            $subject        = $objHelperMail->sfMakeSubject('会員登録のご完了', $objMailText);
             $toCustomerMail = $objMailText->fetch("mail_templates/customer_regist_mail.tpl");
         }