From e26c7b36c50a14f3750a9d75509534d39eade112 Mon Sep 17 00:00:00 2001
From: kurozumi <info@a-zumi.net>
Date: Wed, 17 Feb 2021 11:24:31 +0900
Subject: [PATCH] =?UTF-8?q?Twig2.9=E4=BB=A5=E9=99=8Dfilter=E3=82=BF?=
 =?UTF-8?q?=E3=82=B0=E3=81=AF=E9=9D=9E=E6=8E=A8=E5=A5=A8=E3=81=AA=E3=81=AE?=
 =?UTF-8?q?=E3=81=A7apply=E3=82=BF=E3=82=B0=E3=81=AB=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Eccube/Resource/template/admin/Order/edit.twig              | 2 +-
 src/Eccube/Resource/template/admin/Order/shipping.twig          | 2 +-
 .../Resource/template/admin/Setting/Shop/delivery_edit.twig     | 2 +-
 .../Resource/template/admin/Setting/System/authority.twig       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Eccube/Resource/template/admin/Order/edit.twig b/src/Eccube/Resource/template/admin/Order/edit.twig
index e65e7067ce2..3e229c2cc78 100644
--- a/src/Eccube/Resource/template/admin/Order/edit.twig
+++ b/src/Eccube/Resource/template/admin/Order/edit.twig
@@ -715,7 +715,7 @@ file that was distributed with this source code.
                                     </div>
                                 </div>
                                 <table id="table-form-field" class="table table-striped table-sm mb-0"
-                                       data-prototype="{% filter escape %}{{ include('@admin/Order/order_item_prototype.twig', {'orderItemForm': form.OrderItems.vars.prototype}) }}{% endfilter %}">
+                                       data-prototype="{% apply escape %}{{ include('@admin/Order/order_item_prototype.twig', {'orderItemForm': form.OrderItems.vars.prototype}) }}{% endapply %}">
                                     <thead class="table-active">
                                     <tr class="text-nowrap">
                                         <th class="pt-2 pb-2 pl-3">{{ 'admin.product.product_name_and_code'|trans }}</th>
diff --git a/src/Eccube/Resource/template/admin/Order/shipping.twig b/src/Eccube/Resource/template/admin/Order/shipping.twig
index 318d2631e9d..39261d7f29c 100644
--- a/src/Eccube/Resource/template/admin/Order/shipping.twig
+++ b/src/Eccube/Resource/template/admin/Order/shipping.twig
@@ -527,7 +527,7 @@ file that was distributed with this source code.
                                     <!-- 明細 -->
                                     <div class="row">
                                         <table id="table-form-field_{{ loop.index0 }}" class="table table-striped table-sm mb-0"
-                                               data-prototype="{% filter escape %}{{ include('@admin/Order/order_item_prototype.twig', {'orderItemForm': shippingForm.OrderItems.vars.prototype}) }}{% endfilter %}">
+                                               data-prototype="{% apply escape %}{{ include('@admin/Order/order_item_prototype.twig', {'orderItemForm': shippingForm.OrderItems.vars.prototype}) }}{% endapply %}">
                                             <thead class="table-active">
                                             <tr class="text-nowrap">
                                                 <th class="pt-2 pb-2 pl-3">{{ 'admin.product.product_name_and_code'|trans }}</th>
diff --git a/src/Eccube/Resource/template/admin/Setting/Shop/delivery_edit.twig b/src/Eccube/Resource/template/admin/Setting/Shop/delivery_edit.twig
index 151d4fba908..820832c2f4d 100644
--- a/src/Eccube/Resource/template/admin/Setting/Shop/delivery_edit.twig
+++ b/src/Eccube/Resource/template/admin/Setting/Shop/delivery_edit.twig
@@ -298,7 +298,7 @@ file that was distributed with this source code.
                         <div id="ex-delivery-time" class="card-body p-0">
                             <div class="card rounded border-0 mb-2">
                                 <ul id="delivery-time-group" class="list-group list-group-flush sortable-container"
-                                    data-prototype="{% filter escape %}{{ include('@admin/Setting/Shop/delivery_time_prototype.twig', {'form': form.delivery_times.vars.prototype}) }}{% endfilter %}">
+                                    data-prototype="{% apply escape %}{{ include('@admin/Setting/Shop/delivery_time_prototype.twig', {'form': form.delivery_times.vars.prototype}) }}{% endapply %}">
                                     <li class="list-group-item">
                                         <div class="form-row">
                                             <div class="col-auto d-flex align-items-center">
diff --git a/src/Eccube/Resource/template/admin/Setting/System/authority.twig b/src/Eccube/Resource/template/admin/Setting/System/authority.twig
index c95cec8ea79..fb11a0d22af 100644
--- a/src/Eccube/Resource/template/admin/Setting/System/authority.twig
+++ b/src/Eccube/Resource/template/admin/Setting/System/authority.twig
@@ -62,7 +62,7 @@ file that was distributed with this source code.
                             <p>{{ 'admin.setting.system.authority.example'|trans|raw }}</p>
                             <div class="table-responsive">
                                 <table id="table-authority" class="table table-striped table-condensed with-border"
-                                       data-prototype="{% filter escape %}{{ include('@admin/Setting/System/authority_prototype.twig', {'form': form.AuthorityRoles.vars.prototype}) }}{% endfilter %}">
+                                       data-prototype="{% apply escape %}{{ include('@admin/Setting/System/authority_prototype.twig', {'form': form.AuthorityRoles.vars.prototype}) }}{% endapply %}">
                                     <thead>
                                     <tr>
                                         <th style="width: 210px;">{{ 'admin.setting.system.authority.authority'|trans }}</th>