diff --git a/adminer/create.inc.php b/adminer/create.inc.php index 8d26fcb9..9eebde4b 100644 --- a/adminer/create.inc.php +++ b/adminer/create.inc.php @@ -198,7 +198,7 @@ edit_fields($row["fields"], $collations, "TABLE", $foreign_keys, $comments); - + "> " . confirm() . "\n"; + echo "" . confirm(lang('Drop') . " " . DB) . "\n"; } elseif (!$_POST["add_x"] && $_GET["db"] == "") { echo "\n"; } diff --git a/adminer/event.inc.php b/adminer/event.inc.php index d008952b..019a2cd5 100644 --- a/adminer/event.inc.php +++ b/adminer/event.inc.php @@ -47,6 +47,6 @@ if (!$row && $EVENT != "") {

- + diff --git a/adminer/foreign.inc.php b/adminer/foreign.inc.php index 2e0ff74f..216e4b0d 100644 --- a/adminer/foreign.inc.php +++ b/adminer/foreign.inc.php @@ -86,6 +86,6 @@ foreach ($row["source"] as $key => $val) {

- + diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php index 1276a1e0..42ed8550 100644 --- a/adminer/include/functions.inc.php +++ b/adminer/include/functions.inc.php @@ -221,10 +221,11 @@ function select_input($attrs, $options, $value = "", $onchange = "", $placeholde /** Get onclick confirmation * @param string +* @param string * @return string */ -function confirm($selector = "qsl('input')") { - return script("$selector.onclick = function () { return confirm('" . lang('Are you sure?') . "'); };", ""); +function confirm($message = "", $selector = "qsl('input')") { + return script("$selector.onclick = function () { return confirm('" . ($message ? js_escape($message) . ". " : "") . lang('Are you sure?') . "'); };", ""); } /** Print header for hidden fieldset (close by ) diff --git a/adminer/procedure.inc.php b/adminer/procedure.inc.php index 466e0b8d..f16d93ac 100644 --- a/adminer/procedure.inc.php +++ b/adminer/procedure.inc.php @@ -49,6 +49,6 @@ if (isset($_GET["function"])) {

- + diff --git a/adminer/scheme.inc.php b/adminer/scheme.inc.php index 576a6642..4f64ecc4 100644 --- a/adminer/scheme.inc.php +++ b/adminer/scheme.inc.php @@ -31,7 +31,7 @@ if (!$row) { " . confirm() . "\n"; + echo "" . confirm(lang('Drop') . " $_GET[ns]") . "\n"; } ?> diff --git a/adminer/sequence.inc.php b/adminer/sequence.inc.php index a7bac926..e51e4aee 100644 --- a/adminer/sequence.inc.php +++ b/adminer/sequence.inc.php @@ -28,7 +28,7 @@ if (!$row) { " . confirm() . "\n"; + echo "" . confirm(lang('Drop') . " $SEQUENCE") . "\n"; } ?> diff --git a/adminer/trigger.inc.php b/adminer/trigger.inc.php index f7fa2e3c..a99dca21 100644 --- a/adminer/trigger.inc.php +++ b/adminer/trigger.inc.php @@ -44,6 +44,6 @@ page_header(($name != "" ? lang('Alter trigger') . ": " . h($name) : lang('Creat

- + diff --git a/adminer/type.inc.php b/adminer/type.inc.php index 4ba78bc3..310b5be3 100644 --- a/adminer/type.inc.php +++ b/adminer/type.inc.php @@ -22,7 +22,7 @@ if (!$row) {

" . confirm() . "\n"; + echo "" . confirm(lang('Drop') . " $TYPE") . "\n"; } else { echo "\n"; textarea("as", $row["as"]); diff --git a/adminer/user.inc.php b/adminer/user.inc.php index 59a082e0..af0fb72f 100644 --- a/adminer/user.inc.php +++ b/adminer/user.inc.php @@ -184,6 +184,6 @@ echo "\n"; ?>

- + diff --git a/adminer/view.inc.php b/adminer/view.inc.php index fee3fcdf..35acc5b9 100644 --- a/adminer/view.inc.php +++ b/adminer/view.inc.php @@ -53,6 +53,6 @@ page_header(($TABLE != "" ? lang('Alter view') : lang('Create view')), $error, a

- + diff --git a/changes.txt b/changes.txt index 4de9e56e..c1243e98 100644 --- a/changes.txt +++ b/changes.txt @@ -1,4 +1,5 @@ Adminer 4.5.0-dev: +Display name of the object in confirmation when dropping it Display newlines in column comments (bug #573) Support current_timestamp() as default of time fields (bug #572) Hide window.opener from pages opened in a new window (bug #561)