Fix resetting search (bug #3612507)

diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index 30e5ea194aec2204c306b77907016e7c8af9561a..5ebb2d9f449c169066ac8b8d6defbb2a81b5e98f 100644 (file)
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -264,7 +264,7 @@ username.form['auth[driver]'].onchange();
                        if (!$val || ("$val[col]$val[val]" != "" && in_array($val["op"], $this->operators))) {
                                echo "<div><select name='where[$i][col]' onchange='$change_next'><option value=''>(" . lang('anywhere') . ")" . optionlist($columns, $val["col"], true) . "</select>";
                                echo html_select("where[$i][op]", $this->operators, $val["op"], $change_next);
-                               echo "<input type='search' name='where[$i][val]' value='" . h($val["val"]) . "' onchange='" . ($val ? "selectFieldChange(this.form)" : "selectAddRow(this)") . ";' onsearch='selectSearch(this);'></div>\n";
+                               echo "<input type='search' name='where[$i][val]' value='" . h($val["val"]) . "' onchange='" . ($val ? "selectFieldChange(this.form)" : "selectAddRow(this)") . ";' onsearch='selectSearchSearch(this);'></div>\n";
                        }
                }
                echo "</div></fieldset>\n";

diff --git a/adminer/static/functions.js b/adminer/static/functions.js
index a47f3b6af979e04189fab0dcf191f81adaf1b4c1..17df5faaa9a205206a77aa4dd961ae751b685340 100644 (file)
--- a/adminer/static/functions.js
+++ b/adminer/static/functions.js
@@ -258,7 +258,7 @@ function selectAddRow(field) {
 /** Clear column name after resetting search
 * @param HTMLInputElement
 */
-function selectSearch(el) {
+function selectSearchSearch(el) {
        if (!el.value) {
                el.parentNode.firstChild.selectedIndex = 0;
        }

diff --git a/changes.txt b/changes.txt
index 1f53f7624bca1e25b4801e87d71855700116c4b3..a969f74a168e66545204d737c607988c0684a265 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -6,6 +6,7 @@ Allow using lang() in plugins (customization)
 Remove bzip2 compression support
 Constraint memory used in TAR export
 Allow exporting views dependent on each other (bug #3459151)
+Fix resetting search (bug #3612507)
 MySQL: Optimize create table page and Editor navigation
 MySQL: Display bit type as binary number
 MySQL: Improve export of binary data types

diff --git a/editor/include/adminer.inc.php b/editor/include/adminer.inc.php
index c110fd8834362db12566d486e43a772d4f1c1838..516cd90bed44805791d1b6ee7963f3a0ef4cb460 100644 (file)
--- a/editor/include/adminer.inc.php
+++ b/editor/include/adminer.inc.php
@@ -234,7 +234,7 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
                        if (($val["col"] == "" || $columns[$val["col"]]) && "$val[col]$val[val]" != "") {
                                echo "<div><select name='where[$i][col]'><option value=''>(" . lang('anywhere') . ")" . optionlist($columns, $val["col"], true) . "</select>";
                                echo html_select("where[$i][op]", array(-1 => "") + $this->operators, $val["op"]);
-                               echo "<input type='search' name='where[$i][val]' value='" . h($val["val"]) . "' onsearch='selectSearch(this);'></div>\n";
+                               echo "<input type='search' name='where[$i][val]' value='" . h($val["val"]) . "' onsearch='selectSearchSearch(this);'></div>\n";
                                $i++;
                        }
                }