Changeset 20469


Ignore:
Timestamp:
2011/03/03 15:13:48 (11 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:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/version-2_5-dev/data/class/helper/SC_Helper_Mail.php

    r20459 r20469  
    6767        if ($reply_to == "") $reply_to = $arrInfo['email03']; 
    6868        $error = $arrInfo['email04']; 
    69         $tosubject = $this->sfMakeSubject($tmp_subject); 
     69        $tosubject = $this->sfMakeSubject($tmp_subject, $objMailView); 
    7070         
    7171        $objSendMail->setItem('', $tosubject, $body, $from_address, $from_name, $reply_to, $error, $error); 
     
    164164        $from = $arrInfo['email03']; 
    165165        $error = $arrInfo['email04']; 
    166         $tosubject = $this->sfMakeSubject($tmp_subject); 
     166        $tosubject = $this->sfMakeSubject($tmp_subject, $objMailView); 
    167167 
    168168        $objSendMail->setItem('', $tosubject, $body, $from, $arrInfo['shop_name'], $from, $error, $error, $bcc); 
     
    194194        $from = $arrInfo['email03']; 
    195195        $error = $arrInfo['email04']; 
    196         $tosubject = $this->sfMakeSubject($tmp_subject); 
     196        $tosubject = $this->sfMakeSubject($tmp_subject, $objMailView); 
    197197         
    198198        $objSendMail->setItem($to, $tosubject, $body, $from, $arrInfo['shop_name'], $from, $error, $error, $bcc); 
     
    215215 
    216216    //件名にテンプレートを用いる 
    217     function sfMakeSubject($subject) { 
    218         $objQuery = new SC_Query(); 
    219         $objMailView = new SC_SiteView_Ex(); 
     217    function sfMakeSubject($subject, &$objMailView) { 
     218        if (empty($objMailView)) { 
     219            $objMailView = new SC_SiteView_Ex(); 
     220        } 
    220221        $objTplAssign = new stdClass; 
    221222         
    222         $arrInfo = $objQuery->select("*","dtb_baseinfo"); 
    223         $arrInfo = $arrInfo[0]; 
     223        $arrInfo = SC_Helper_DB_Ex::sfGetBasisData(); 
    224224        $objTplAssign->tpl_shopname=$arrInfo['shop_name']; 
    225225        $objTplAssign->tpl_infoemail=$subject; // 従来互換 
     
    296296        // 仮会員が有効の場合 
    297297        if(CUSTOMER_CONFIRM_MAIL == true and $arrCustomerData['status'] == 1) { 
    298             $subject        = $objHelperMail->sfMakeSubject('会員登録のご確認'); 
     298            $subject        = $objHelperMail->sfMakeSubject('会員登録のご確認', $objMailText); 
    299299            $toCustomerMail = $objMailText->fetch("mail_templates/customer_mail.tpl"); 
    300300        } else { 
    301             $subject        = $objHelperMail->sfMakeSubject('会員登録のご完了'); 
     301            $subject        = $objHelperMail->sfMakeSubject('会員登録のご完了', $objMailText); 
    302302            $toCustomerMail = $objMailText->fetch("mail_templates/customer_regist_mail.tpl"); 
    303303        } 
Note: See TracChangeset for help on using the changeset viewer.