diff --git a/adminer/create.inc.php b/adminer/create.inc.php index fc15a237..7d355ba0 100644 --- a/adminer/create.inc.php +++ b/adminer/create.inc.php @@ -162,7 +162,7 @@ foreach ($engines as $engine) {

-: " autocapitalize="off"> +: " autocapitalize="off"> " . optionlist(array("" => "(" . lang('engine') . ")") + $engines, $row["Engine"]) . "" . on_help("getTarget(event).value", 1) . script("qsl('select').onchange = helpClose;") : ""); ?> "(" . lang('collation') . ")") + $collations, $row["Collation"]) : ""); ?> @@ -191,7 +191,7 @@ edit_fields($row["fields"], $collations, "TABLE", $foreign_keys, $comments); " . lang('Comment') . "" . script("qsl('input').onclick = partial(editingCommentsClick, true);") - . ' ' + . ' ' : '') ; ?>

diff --git a/adminer/database.inc.php b/adminer/database.inc.php index 71b1de40..bc5e4dbf 100644 --- a/adminer/database.inc.php +++ b/adminer/database.inc.php @@ -60,7 +60,7 @@ if ($_POST) { ' . h($name) . '
' - : '' + : '' ) . "\n" . ($collations ? html_select("collation", array("" => "(" . lang('collation') . ")") + $collations, $row["collation"]) . doc_link(array( 'sql' => "charset-charsets.html", 'mariadb' => "supported-character-sets-and-collations/", diff --git a/adminer/event.inc.php b/adminer/event.inc.php index 91d07f12..d0ec05f2 100644 --- a/adminer/event.inc.php +++ b/adminer/event.inc.php @@ -36,12 +36,12 @@ if (!$row && $EVENT != "") { -
" maxlength="64" autocapitalize="off"> +
" data-maxlength="64" autocapitalize="off">
">
">
" class="size">
-
" maxlength="64"> +
" data-maxlength="64">

diff --git a/adminer/include/editing.inc.php b/adminer/include/editing.inc.php index 69f02df5..405efdb5 100644 --- a/adminer/include/editing.inc.php +++ b/adminer/include/editing.inc.php @@ -272,14 +272,14 @@ function edit_fields($fields, $collations, $type = "TABLE", $foreign_keys = arra ?> > " . html_select("fields[$i][inout]", explode("|", $inout), $field["inout"]) : ""); ?> -" maxlength="64" autocapitalize="off" aria-labelledby="label-name"> 1 ? "" : " editingAddRow.call(this);") . " };", ""); ?> +" data-maxlength="64" autocapitalize="off" aria-labelledby="label-name"> 1 ? "" : " editingAddRow.call(this);") . " };", ""); ?> " aria-labelledby="label-default">" : ""); + echo (support("comment") ? "

: " maxlength="64" autocapitalize="off"> +

: " data-maxlength="64" autocapitalize="off"> diff --git a/adminer/trigger.inc.php b/adminer/trigger.inc.php index 54454991..269609c6 100644 --- a/adminer/trigger.inc.php +++ b/adminer/trigger.inc.php @@ -39,7 +39,7 @@ page_header(($name != "" ? lang('Alter trigger') . ": " . h($name) : lang('Creat ": ""); ?>
-

: " maxlength="64" autocapitalize="off"> +

: " data-maxlength="64" autocapitalize="off">

diff --git a/adminer/user.inc.php b/adminer/user.inc.php index babcc100..8cb76cbe 100644 --- a/adminer/user.inc.php +++ b/adminer/user.inc.php @@ -132,8 +132,8 @@ if ($_POST) { ?> -
" autocapitalize="off"> -
" autocapitalize="off"> +
" autocapitalize="off"> +
" autocapitalize="off">
" autocomplete="new-password"> diff --git a/adminer/view.inc.php b/adminer/view.inc.php index 0b2f8fa2..6bbaf4ab 100644 --- a/adminer/view.inc.php +++ b/adminer/view.inc.php @@ -48,7 +48,7 @@ page_header(($TABLE != "" ? lang('Alter view') : lang('Create view')), $error, a ?> -

: " maxlength="64" autocapitalize="off"> +

: " data-maxlength="64" autocapitalize="off">

diff --git a/changes.txt b/changes.txt index b7b5972b..1676a5c2 100644 --- a/changes.txt +++ b/changes.txt @@ -3,6 +3,7 @@ Fix inline editing of empty cells (regression from 4.6.3) Allow adding more than two indexes and forign key columns at a time (regression from 4.4.0) Fix function change with set data type Increase username maxlength to 80 (bug #623) +Make maxlength in all fields a soft limit MySQL: Support foreign keys created with ANSI quotes (bug #620) Adminer 4.6.3 (released 2018-06-28): diff --git a/plugins/edit-calendar.php b/plugins/edit-calendar.php index a1b510f4..655a3723 100644 --- a/plugins/edit-calendar.php +++ b/plugins/edit-calendar.php @@ -44,7 +44,7 @@ class AdminerEditCalendar { if (preg_match("~date|time~", $field["type"])) { $dateFormat = "changeYear: true, dateFormat: 'yy-mm-dd'"; //! yy-mm-dd regional $timeFormat = "showSecond: true, timeFormat: 'HH:mm:ss', timeInput: true"; - return "" . script( + return "" . script( "jQuery('#fields-" . js_escape($field["field"]) . "')." . ($field["type"] == "time" ? "timepicker({ $timeFormat })" : (preg_match("~time~", $field["type"]) ? "datetimepicker({ $dateFormat, $timeFormat })" diff --git a/plugins/slugify.php b/plugins/slugify.php index f934ae35..094d4d1e 100644 --- a/plugins/slugify.php +++ b/plugins/slugify.php @@ -34,7 +34,7 @@ class AdminerSlugify { } $slug = $slugify[$field["field"]]; if ($slug !== null) { - return "" + return "" . script("qsl('input').onchange = function () { var find = '$this->from'; var repl = '$this->to';