From 7a9defe02caf3534a896ceeadc60bde2ea8cca82 Mon Sep 17 00:00:00 2001 From: Manthan Surkar Date: Mon, 20 Jan 2020 23:08:32 +0530 Subject: [PATCH 1/4] Fix: Unwanted confirmation for abandoning change Signed-off-by: Manthan Surkar --- js/ajax.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/js/ajax.js b/js/ajax.js index 469ecf1470..a098fcc2b9 100644 --- a/js/ajax.js +++ b/js/ajax.js @@ -152,6 +152,13 @@ var AJAX = { * @return void */ lockPageHandler: function (event) { + // don't consider checkbox event + if (typeof(event.target) !== 'undefined') { + if (event.target.type === 'checkbox') { + return; + } + } + var newHash = null; var oldHash = null; var lockId; From 1a1160f03bece9c1e1d9f7b4e35de2ae2c30019e Mon Sep 17 00:00:00 2001 From: William Desportes Date: Wed, 22 Jan 2020 19:24:38 +0100 Subject: [PATCH 2/4] Add ChangeLog entry for #15798 Signed-off-by: William Desportes --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 3c294d92a3..1e96ccbb75 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,7 @@ phpMyAdmin - ChangeLog - issue #13864 Fix ENUM's radiobuttons reset on "Continue insertion with" changes - issue #15811 Fixed browse foreign values doesn't show a modal with grid edit - issue #15817 Fix "new table" layout issue on original theme +- issue #15798 Fixed not needed prompt before abandoning changes on SQL tab after only changing a checkbox 5.0.1 (2020-01-07) - issue #15719 Fixed error 500 when browsing a table when $cfg['LimitChars'] used a string and not an int value From 3116e9149846d70d0a08f6824828f86dccf8f401 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Wed, 22 Jan 2020 22:42:17 +0100 Subject: [PATCH 3/4] Fix #15833 - TypeError when submitting unchanged data Signed-off-by: William Desportes --- libraries/classes/Sql.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/classes/Sql.php b/libraries/classes/Sql.php index fb4b07f3f1..8c0935f148 100644 --- a/libraries/classes/Sql.php +++ b/libraries/classes/Sql.php @@ -1793,7 +1793,7 @@ class Sql * @param array $analyzed_sql_results analysed sql results * @param string $db current database * @param string $table current table - * @param string|null $message message to show + * @param Message|string|null $message message to show * @param array|null $sql_data sql data * @param DisplayResults $displayResultsObject Instance of DisplayResults * @param string $pmaThemeImage uri of the theme image @@ -1818,7 +1818,7 @@ class Sql array $analyzed_sql_results, $db, $table, - ?string $message, + $message, ?array $sql_data, $displayResultsObject, $pmaThemeImage, @@ -1933,7 +1933,7 @@ class Sql $scripts->addFile('makegrid.js'); $scripts->addFile('sql.js'); if (isset($message)) { - $message = Message::success($message); + $message = is_string($message) ? Message::success($message) : $message; $tableMaintenanceHtml = Util::getMessage( $message, $GLOBALS['sql_query'], From a10d81a2aff530b91c0421c1166befa1de1bbaa2 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Wed, 22 Jan 2020 22:44:27 +0100 Subject: [PATCH 4/4] Add ChangeLog entry for #15833 Signed-off-by: William Desportes --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 1e96ccbb75..9965953f0c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,7 @@ phpMyAdmin - ChangeLog - issue #15811 Fixed browse foreign values doesn't show a modal with grid edit - issue #15817 Fix "new table" layout issue on original theme - issue #15798 Fixed not needed prompt before abandoning changes on SQL tab after only changing a checkbox +- issue #15833 Fix php TypeError when submitting unchanged data 5.0.1 (2020-01-07) - issue #15719 Fixed error 500 when browsing a table when $cfg['LimitChars'] used a string and not an int value