Avoid duplicate values of HTML id attributes (bug #3614245)

Unsupports <label> in IE6.

diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index a9ce35d9890bdebbc26921f354de9565f5ffd61e..4d6658712ea5db206561a84b0dc2aaf04008392e 100644 (file)
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -287,7 +287,7 @@ username.form['auth[driver]'].onchange();
                        }
                }
                echo "<div><select name='order[$i]' onchange='selectAddRow(this);'><option>" . optionlist($columns, null, true) . "</select>";
-               echo "<label><input type='checkbox' name='desc[$i]' value='1'>" . lang('descending') . "</label></div>\n"; // not checkbox() to allow selectAddRow()
+               echo checkbox("desc[$i]", 1, false, lang('descending')) . "</div>\n";
                echo "</div></fieldset>\n";
        }
        

diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index 631280271373754e9bec1b182570888f9cf04b51..8dbf25b4b9da646fc93712045ccbcf657d097e02 100644 (file)
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -99,14 +99,12 @@ function nl_br($string) {
 * @return string
 */
 function checkbox($name, $value, $checked, $label = "", $onclick = "", $class = "") {
-       static $id = 0;
-       $id++;
        $return = "<input type='checkbox' name='$name' value='" . h($value) . "'"
                . ($checked ? " checked" : "")
                . ($onclick ? ' onclick="' . h($onclick) . '"' : '')
-               . " id='checkbox-$id'>"
+               . ">"
        ;
-       return ($label != "" || $class ? "<label for='checkbox-$id'" . ($class ? " class='$class'" : "") . ">$return" . h($label) . "</label>" : $return);
+       return ($label != "" || $class ? "<label" . ($class ? " class='$class'" : "") . ">$return" . h($label) . "</label>" : $return);
 }
 
 /** Generate list of HTML options

diff --git a/adminer/static/editing.js b/adminer/static/editing.js
index 61a97a040617e6e21d723af9aa92e7a197e054ab..e639274e37f4e206d38cf39dbe47331f7026566e 100644 (file)
--- a/adminer/static/editing.js
+++ b/adminer/static/editing.js
@@ -295,7 +295,7 @@ function editingAddRow(button, focus) {
        var tags = row.getElementsByTagName('select');
        var tags2 = row2.getElementsByTagName('select');
        for (var i=0; i < tags.length; i++) {
-               tags2[i].name = tags[i].name.replace(/([0-9.]+)/, x);
+               tags2[i].name = tags[i].name.replace(/[0-9.]+/, x);
                tags2[i].selectedIndex = tags[i].selectedIndex;
        }
        tags = row.getElementsByTagName('input');

diff --git a/changes.txt b/changes.txt
index 3912df7dff4fcfa19372298c1f085ccd827ad7fd..981422ad344e6cbfbe5fd27aa425972671c82be5 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -2,6 +2,7 @@ Adminer 3.7.1-dev:
 Increase click target for checkboxes
 Use shadow for highlighting default button
 Don't use LIMIT 1 if inline updating unique row
+Don't check previous checkbox on added column in create table (bug #3614245)
 Order table list by name
 PostgreSQL: Fix detecting oid column in PDO
 PostgreSQL: Handle timestamp types (bug #3614086)