Display edit form after error in clone or multi-edit

diff --git a/adminer/edit.inc.php b/adminer/edit.inc.php
index 0a56f9626085a3a88509adc7096cfcca7cd19461..b95dcfd33aa0a5ed86ce2f31ccd353ff9e1fda27 100644 (file)
--- a/adminer/edit.inc.php
+++ b/adminer/edit.inc.php
@@ -59,14 +59,6 @@ if ($_POST && !$error && !isset($_GET["select"])) {
        }
 }
 
-$table_name = $adminer->tableName(table_status1($TABLE, true));
-page_header(
-       ($update ? lang('Edit') : lang('Insert')),
-       $error,
-       array("select" => array($TABLE, $table_name)),
-       $table_name
-);
-
 $row = null;
 if ($_POST["save"]) {
        $row = (array) $_POST["fields"];
@@ -118,12 +110,4 @@ if (!support("table") && !$fields) {
        }
 }
 
-if ($row === false) {
-       echo "<p class='error'>" . lang('No rows.') . "\n";
-}
-?>
-
-<div id="message"></div>
-
-<?php
-edit_form($fields, $row, $update);
+edit_form($TABLE, $fields, $row, $update);

diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index cbb6294825b4f671987e81276ad411499366c30f..744a55b258c2ecef8a9af7801e7603874af31dfd 100644 (file)
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -1249,14 +1249,26 @@ function on_help($command, $side = 0) {
 }
 
 /** Print edit data form
+* @param string
 * @param array
 * @param mixed
 * @param bool
 * @return null
 */
-function edit_form($fields, $row, $update) {
-       global $adminer, $jush, $token;
+function edit_form($TABLE, $fields, $row, $update) {
+       global $adminer, $jush, $token, $error;
+       $table_name = $adminer->tableName(table_status1($TABLE, true));
+       page_header(
+               ($update ? lang('Edit') : lang('Insert')),
+               $error,
+               array("select" => array($TABLE, $table_name)),
+               $table_name
+       );
+       if ($row === false) {
+               echo "<p class='error'>" . lang('No rows.') . "\n";
+       }
        ?>
+<div id="message"></div>
 <form action="" method="post" enctype="multipart/form-data" id="form">
 <?php
        if (!$fields) {

diff --git a/adminer/select.inc.php b/adminer/select.inc.php
index a75deb45b110f83836b97a5bf061ded855fb6fbc..2e785a08fb0e64730955d3c5c6fcd1f85e81fec4 100644 (file)
--- a/adminer/select.inc.php
+++ b/adminer/select.inc.php
@@ -139,7 +139,11 @@ if ($_POST && !$error) {
                                }
                        }
                        queries_redirect(remove_from_uri($_POST["all"] && $_POST["delete"] ? "page" : ""), $message, $result);
-                       //! display edit page in case of an error
+                       if (!$_POST["delete"]) {
+                               edit_form($TABLE, $fields, (array) $_POST["fields"], !$_POST["clone"]);
+                               page_footer();
+                               exit;
+                       }
 
                } elseif (!$_POST["import"]) { // modify
                        if (!$_POST["val"]) {

diff --git a/changes.txt b/changes.txt
index a6f17d9ae08996d27dbf666b9deff83139f7e211..8abfbee14d3039ded2fbf1fbc2b8ddb052b884d3 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -1,4 +1,5 @@
 Adminer 4.0.4-dev:
+Display edit form after error in clone or multi-edit
 Display time of the select command
 Improve gzip export ratio (bug #387)
 MySQL: Fix editing rows by binary values, bug since Adminer 3.7.1