Merge branch 'dev-5' into dev-5.1

seto1 · Mar 26, 2024 · 01ceed3 · 01ceed3
2 parents a4b95a4 + f803211
commit 01ceed3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/plugins/bc-front/templates/plugin/BcMail/email/text/mail_default.php b/plugins/bc-front/templates/plugin/BcMail/email/text/mail_default.php
@@ -17,6 +17,7 @@
  * @var \BcMail\View\MailFrontEmailView $this
  * @var array $other その他データ
  * @var array $mailConfig メール設定データ
+ * @var \BaserCore\Model\Entity\Site $site サイト
  */
 ?>
 
@@ -29,7 +30,7 @@
   <?php echo __d('baser_core', 'この度は、ご連絡ありがとうございます。') ?>　
   <?php echo __d('baser_core', '送信内容は下記のようになっております。') ?>　
 <?php elseif ($other['mode'] === 'admin'): ?>
-　<?php echo $mailConfig->site_name ?> <?php echo __d('baser_core', 'へ連絡を受け付けました。') ?>　
+　<?php echo $site->display_name ?> <?php echo __d('baser_core', 'へ連絡を受け付けました。') ?>　
 　<?php echo __d('baser_core', '受信内容は下記のとおりです。') ?>　
 <?php endif; ?>
 

diff --git a/plugins/bc-mail/src/Service/Front/MailFrontService.php b/plugins/bc-mail/src/Service/Front/MailFrontService.php
@@ -12,6 +12,7 @@
 namespace BcMail\Service\Front;
 
 use BaserCore\Error\BcException;
+use BaserCore\Service\SitesServiceInterface;
 use BaserCore\Utility\BcContainerTrait;
 use BaserCore\Utility\BcSiteConfig;
 use BaserCore\Utility\BcUtil;
@@ -354,7 +355,10 @@ public function createMailData(
         /** @var MailMessagesService $mailMessagesService */
         $mailMessagesService = $this->getService(MailMessagesServiceInterface::class);
         $mailMessage = $mailMessagesService->MailMessages->convertToDb($mailFields, $mailMessage);
+        $siteService = $this->getService(SitesServiceInterface::class);
+        $site = $siteService->get($mailContent->content->site_id);
         return $mailMessagesService->MailMessages->convertDatasToMail([
+            'site' => $site,
             'message' => $mailMessage,
             'content' => $mailContent->content,
             'mailFields' => $mailFields,