Revert using @this in formChecked

diff --git a/adminer/db.inc.php b/adminer/db.inc.php
index b93ca700d86e9445652d6e1e63fb4688cbbe9916..a341d1b9b5149a1e7054641d6fc22e940f6433d1 100644 (file)
--- a/adminer/db.inc.php
+++ b/adminer/db.inc.php
@@ -135,7 +135,7 @@ if ($adminer->homepage()) {
                                        echo (support("copy") ? " <input type='submit' name='copy' value='" . lang('Copy') . "'>" : "");
                                        echo "\n";
                                }
-                               echo "<input type='hidden' name='all' value='' onclick=\"selectCount('selected', formChecked.call(this, /^(tables|views)\[/));" . (support("table") ? " selectCount('selected2', formChecked.call(this, /^tables\[/) || $tables);" : "") . "\">\n"; // used by trCheck()
+                               echo "<input type='hidden' name='all' value='' onclick=\"selectCount('selected', formChecked(this, /^(tables|views)\[/));" . (support("table") ? " selectCount('selected2', formChecked.call(this, /^tables\[/) || $tables);" : "") . "\">\n"; // used by trCheck()
                                echo "<input type='hidden' name='token' value='$token'>\n";
                                echo "</div></fieldset>\n";
                        }

diff --git a/adminer/include/connect.inc.php b/adminer/include/connect.inc.php
index 400741320b77a647ad9e0ed6db9c09b0d3db717c..061475a1ef2434665156ede42f50c08825e7ba0e 100644 (file)
--- a/adminer/include/connect.inc.php
+++ b/adminer/include/connect.inc.php
@@ -56,7 +56,7 @@ function connect_error() {
                        echo "</table>\n";
                        echo (support("database")
                                ? "<fieldset><legend>" . lang('Selected') . " <span id='selected'></span></legend><div>\n"
-                                       . "<input type='hidden' name='all' value='' onclick=\"selectCount('selected', formChecked.call(this, /^db/));\">\n" // used by trCheck()
+                                       . "<input type='hidden' name='all' value='' onclick=\"selectCount('selected', formChecked(this, /^db/));\">\n" // used by trCheck()
                                        . "<input type='submit' name='drop' value='" . lang('Drop') . "'" . confirm() . ">\n"
                                        . "</div></fieldset>\n"
                                : ""

diff --git a/adminer/select.inc.php b/adminer/select.inc.php
index 191b28a7c05f6a92ae2a64e76b6ded2fa1a42eae..8ccaeeda8bcaaf6f74f77f114fd2abba28861510 100644 (file)
--- a/adminer/select.inc.php
+++ b/adminer/select.inc.php
@@ -488,7 +488,7 @@ if (!$columns && support("table")) {
                        echo "<p class='count'>\n";
                        echo ($found_rows !== false ? "(" . ($exact_count ? "" : "~ ") . lang('%d row(s)', $found_rows) . ") " : "");
                        $display_rows = ($exact_count ? "" : "~ ") . $found_rows;
-                       echo checkbox("all", 1, 0, lang('whole result'), "var checked = formChecked.call(this, /check/); selectCount('selected', this.checked ? '$display_rows' : checked); selectCount('selected2', this.checked || !checked ? '$display_rows' : checked);") . "\n";
+                       echo checkbox("all", 1, 0, lang('whole result'), "var checked = formChecked(this, /check/); selectCount('selected', this.checked ? '$display_rows' : checked); selectCount('selected2', this.checked || !checked ? '$display_rows' : checked);") . "\n";
 
                        if ($adminer->selectCommandPrint()) {
                                ?>

diff --git a/adminer/static/functions.js b/adminer/static/functions.js
index 582979c2f96e0cceabfec54fd2387d008a4cfba4..f43e3a9113e39c6d9c355c5579279e1d60fc0281 100644 (file)
--- a/adminer/static/functions.js
+++ b/adminer/static/functions.js
@@ -172,13 +172,13 @@ function formUncheck(id) {
 }
 
 /** Get number of checked elements matching given name
+* @param HTMLInputElement
 * @param RegExp
 * @return number
-* @this HTMLInputElement
 */
-function formChecked(name) {
+function formChecked(el, name) {
        var checked = 0;
-       var elems = this.form.elements;
+       var elems = el.form.elements;
        for (var i=0; i < elems.length; i++) {
                if (name.test(elems[i].name) && elems[i].checked) {
                        checked++;