Fix spaceless is deprecated

"Deprecation Notice in ./vendor/twig/twig/src/TokenParser/SpacelessTokenParser.php#36
 The spaceless tag in "columns_definitions/column_virtuality.twig" at line 18 is deprecated since Twig 2.7, use the spaceless filter instead."

Signed-off-by: William Desportes <williamdes@wdes.fr>

6 files changed, 12 insertions, 12 deletions

diff --git a/templates/columns_definitions/column_virtuality.twig b/templates/columns_definitions/column_virtuality.twig
index 89fd50f620..03e7b93856 100644
--- a/templates/columns_definitions/column_virtuality.twig
+++ b/templates/columns_definitions/column_virtuality.twig
@@ -14,13 +14,13 @@
 </select>
 
 {% if char_editing == 'textarea' %}
-    {% spaceless %}
+    {% apply spaceless %}
     <textarea name="field_expression[{{ column_number }}]"
         cols="15"
         class="textfield expression">
         {{ expression }}
     </textarea>
-    {% endspaceless %}
+    {% endapply %}
 {% else %}
     <input type="text"
         name="field_expression[{{ column_number }}]"
diff --git a/templates/columns_definitions/partitions.twig b/templates/columns_definitions/partitions.twig
index bede07f621..f36b52947d 100644
--- a/templates/columns_definitions/partitions.twig
+++ b/templates/columns_definitions/partitions.twig
@@ -143,11 +143,11 @@
                         ) }}
                     </td>
                     <td>
-                        {% spaceless %}
+                        {% apply spaceless %}
                         <textarea name="{{ subpartition['prefix'] }}[comment]">
                             {{ subpartition['comment'] }}
                         </textarea>
-                        {% endspaceless %}
+                        {% endapply %}
                     </td>
                     <td>
                         <input type="text" name="{{ subpartition['prefix'] }}[data_directory]"
diff --git a/templates/database/designer/js_fields.twig b/templates/database/designer/js_fields.twig
index f097997e4a..58a5a5e528 100644
--- a/templates/database/designer/js_fields.twig
+++ b/templates/database/designer/js_fields.twig
@@ -1,6 +1,6 @@
 {# Invisible characters will make javascript crash #}
-{% spaceless %}
+{% apply spaceless %}
 <script type="text/javascript">
 var designer_config = {{ designer_config | raw }};
 </script>
-{% endspaceless %}
+{% endapply %}
diff --git a/templates/database/multi_table_query/form.twig b/templates/database/multi_table_query/form.twig
index f9ef6146bc..763fa4ffb2 100644
--- a/templates/database/multi_table_query/form.twig
+++ b/templates/database/multi_table_query/form.twig
@@ -159,7 +159,7 @@
         </fieldset>
 
         <fieldset>
-            {% spaceless %}
+            {% apply spaceless %}
                 <textarea id="MultiSqlquery"
                     cols="80"
                     rows="4"
@@ -167,7 +167,7 @@
                     name="sql_query"
                     dir="ltr">
                 </textarea>
-            {% endspaceless %}
+            {% endapply %}
         </fieldset>
     </fieldset>
 
diff --git a/templates/display/export/options_rows.twig b/templates/display/export/options_rows.twig
index 5a7e39ed4b..1d4f866a02 100644
--- a/templates/display/export/options_rows.twig
+++ b/templates/display/export/options_rows.twig
@@ -9,7 +9,7 @@
                 <li>
                     <label for="limit_to">{% trans 'Number of rows:' %}</label>
                     <input type="text" id="limit_to" name="limit_to" size="5" value="
-                        {%- spaceless %}
+                        {%- apply spaceless %}
                             {% if limit_to is not null %}
                                 {{ limit_to }}
                             {% elseif unlim_num_rows is not empty and unlim_num_rows != 0 %}
@@ -17,7 +17,7 @@
                             {% else %}
                                 {{ number_of_rows }}
                             {% endif %}
-                        {% endspaceless %}" onfocus="this.select()">
+                        {% endapply %}" onfocus="this.select()">
                 </li>
                 <li>
                     <label for="limit_from">{% trans 'Row to begin at:' %}</label>
diff --git a/templates/display/import/javascript.twig b/templates/display/import/javascript.twig
index 01bd199f39..5f3e46c526 100644
--- a/templates/display/import/javascript.twig
+++ b/templates/display/import/javascript.twig
@@ -24,7 +24,7 @@ $( function() {
             {% set import_url = Url_getCommonRaw({'import_status': 1}) %}
 
             {% set upload_html %}
-                {% spaceless %}
+                {% apply spaceless %}
                     <div class="upload_progress">
                         <div class="upload_progress_bar_outer">
                             <div class="percentage"></div>
@@ -37,7 +37,7 @@ $( function() {
                         </div>
                         <div id="statustext"></div>
                     </div>
-                {% endspaceless %}
+                {% endapply %}
             {% endset %}
 
             {# Start output #}