Pass $error as param

diff --git a/adminer/edit.inc.php b/adminer/edit.inc.php
index c8039c375b1a56a780dd64bfac08d58efb1cce5d..5f12f8245cf8aa1958ad0a5b345e3f1cd77f4d53 100644 (file)
--- a/adminer/edit.inc.php
+++ b/adminer/edit.inc.php
@@ -110,4 +110,4 @@ if (!support("table") && !$fields) { // used by Mongo and SimpleDB
        }
 }
 
-edit_form($TABLE, $fields, $row, $update);
+edit_form($TABLE, $fields, $row, $update, $error);

diff --git a/adminer/include/html.inc.php b/adminer/include/html.inc.php
index f56a62ffdfb2346ee9f8d654a309bf3cf30338b9..18e8cd986e93bd1a10ea9b8808eacec0febc7b33 100644 (file)
--- a/adminer/include/html.inc.php
+++ b/adminer/include/html.inc.php
@@ -363,8 +363,8 @@ function on_help(string $command, int $side = 0): string {
 * @param Field[] $fields
 * @param mixed $row
 */
-function edit_form(string $table, array $fields, $row, ?bool $update): void {
-       global $adminer, $error;
+function edit_form(string $table, array $fields, $row, ?bool $update, string $error = ''): void {
+       global $adminer;
        $table_name = $adminer->tableName(table_status1($table, true));
        page_header(
                ($update ? lang('Edit') : lang('Insert')),

diff --git a/adminer/select.inc.php b/adminer/select.inc.php
index ae939debbdb7fef510cbfc87cd32e058b98dca0d..b71656aac3d9e505cd8ee1146458cb69130f7a08 100644 (file)
--- a/adminer/select.inc.php
+++ b/adminer/select.inc.php
@@ -159,7 +159,7 @@ if ($_POST && !$error) {
                        queries_redirect(remove_from_uri($_POST["all"] && $_POST["delete"] ? "page" : ""), $message, $result);
                        if (!$_POST["delete"]) {
                                $post_fields = (array) $_POST["fields"];
-                               edit_form($TABLE, array_intersect_key($fields, $post_fields), $post_fields, !$_POST["clone"]);
+                               edit_form($TABLE, array_intersect_key($fields, $post_fields), $post_fields, !$_POST["clone"], $error);
                                page_footer();
                                exit;
                        }