Merge pull request #4499 from k-yamamura/bugfix-admin-mailcontroller

メール設定画面でメール本文を修正しても反映されない不具合修正

src/Eccube/Controller/Admin/Setting/Shop/MailController.php

@@ -19,6 +19,7 @@
 use Eccube\Event\EventArgs;
 use Eccube\Form\Type\Admin\MailType;
 use Eccube\Repository\MailTemplateRepository;
+use Eccube\Util\CacheUtil;
 use Eccube\Util\StringUtil;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
 use Symfony\Component\Filesystem\Filesystem;
@@ -51,7 +52,7 @@ public function __construct(MailTemplateRepository $mailTemplateRepository)
      * @Route("/%eccube_admin_route%/setting/shop/mail/{id}", requirements={"id" = "\d+"}, name="admin_setting_shop_mail_edit")
      * @Template("@admin/Setting/Shop/mail.twig")
      */
-    public function index(Request $request, MailTemplate $Mail = null, Environment $twig)
+    public function index(Request $request, MailTemplate $Mail = null, Environment $twig, CacheUtil $cacheUtil)
     {
         $builder = $this->formFactory
             ->createBuilder(MailType::class, $Mail);
@@ -128,6 +129,9 @@ public function index(Request $request, MailTemplate $Mail = null, Environment $
 
                 $this->addSuccess('admin.common.save_complete', 'admin');
 
+                // キャッシュの削除
+                $cacheUtil->clearTwigCache();
+
                 return $this->redirectToRoute('admin_setting_shop_mail_edit', ['id' => $Mail->getId()]);
             }
         }