From e97ad238fc03cb7234cfa34a71d48879d6cf1c5a Mon Sep 17 00:00:00 2001
From: Petr Duda <petrduda@seznam.cz>
Date: Mon, 5 Oct 2020 21:52:07 +0200
Subject: [PATCH] Fix #16245 Failed Zoom search clears existing values

Signed-off-by: Petr Duda <petrduda@seznam.cz>
---
 templates/table/search/rows_zoom.twig | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/templates/table/search/rows_zoom.twig b/templates/table/search/rows_zoom.twig
index dc46f1d92d..9245959aaa 100644
--- a/templates/table/search/rows_zoom.twig
+++ b/templates/table/search/rows_zoom.twig
@@ -37,10 +37,10 @@
             and criteria_column_names[i] != 'pma_null' %}
             {% set key = keys[criteria_column_names[i]] %}
             {% set properties = self.getColumnProperties(i, key) %}
-            {% set type = type|merge({i: properties['type']}) %}
-            {% set collation = collation|merge({i: properties['collation']}) %}
-            {% set func = func|merge({i: properties['func']}) %}
-            {% set value = value|merge({i: properties['value']}) %}
+            {% set type = type|merge({(i): properties['type']}) %}
+            {% set collation = collation|merge({(i): properties['collation']}) %}
+            {% set func = func|merge({(i): properties['func']}) %}
+            {% set value = value|merge({(i): properties['value']}) %}
         {% endif %}
         {# Column type #}
         <td dir="ltr">
@@ -56,9 +56,9 @@
         </td>
         {# Inputbox for search criteria value #}
         <td>
+            {{ value[i] is defined ? value[i]|raw }}
         </td>
         <td>
-            {{ value[i] is defined ? value[i]|raw }}
             {# Displays hidden fields #}
             <input type="hidden"
                 name="criteriaColumnTypes[{{ i }}]"