Index: branches/version-2_5-dev/data/class/helper/SC_Helper_Mail.php
===================================================================
--- branches/version-2_5-dev/data/class/helper/SC_Helper_Mail.php	(revision 20459)
+++ branches/version-2_5-dev/data/class/helper/SC_Helper_Mail.php	(revision 20469)
@@ -67,5 +67,5 @@
         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,5 +164,5 @@
         $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,5 +194,5 @@
         $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,11 +215,11 @@
 
     //件名にテンプレートを用いる
-    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,8 +296,8 @@
         // 仮会員が有効の場合
         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");
         }