Skip generated columns in multi-edit (bug #882)

diff --git a/adminer/select.inc.php b/adminer/select.inc.php
index 7c58c9aa5fa2332c13a98971d9ad1fdad16a04fc..51720960897d386532ec0a655dd34bd83dba5c22 100644 (file)
--- a/adminer/select.inc.php
+++ b/adminer/select.inc.php
@@ -99,7 +99,7 @@ if ($_POST && !$error) {
                        $affected = 0;
                        $set = array();
                        if (!$_POST["delete"]) {
-                               foreach ($columns as $name => $val) { //! should check also for edit or insert privileges
+                               foreach ($_POST["fields"] as $name => $val) {
                                        $val = process_input($fields[$name]);
                                        if ($val !== null && ($_POST["clone"] || $val !== false)) {
                                                $set[idf_escape($name)] = ($val !== false ? $val : idf_escape($name));
@@ -146,7 +146,8 @@ if ($_POST && !$error) {
                        }
                        queries_redirect(remove_from_uri($_POST["all"] && $_POST["delete"] ? "page" : ""), $message, $result);
                        if (!$_POST["delete"]) {
-                               edit_form($TABLE, $fields, (array) $_POST["fields"], !$_POST["clone"]);
+                               $post_fields = (array) $_POST["fields"];
+                               edit_form($TABLE, array_intersect_key($fields, $post_fields), $post_fields, !$_POST["clone"]);
                                page_footer();
                                exit;
                        }

diff --git a/changes.txt b/changes.txt
index 5b7b01bf604aaed343170a224f93c63c9c5de001..a5488ed32784cd9581e25f7ced93e230380ba287 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -1,6 +1,7 @@
 Adminer dev:
 Speed up with disabled output buffering
 Don't autofocus computed fields in insert form
+Skip generated columns in multi-edit (bug #882)
 PostgreSQL: Compute size of all databases (bug #881)
 PostgreSQL: Do not alter indexes with expressions
 PostgreSQL: Fix export of indexes with expressions (bug #768)