Twig2.9以降filterタグは非推奨なのでapplyタグに変更

okazy · Feb 17, 2021 · e26c7b3 · e26c7b3
1 parent 9687191
commit e26c7b3
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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>