From 1a605524174666bd6364d92c8706038eeb6cd9d8 Mon Sep 17 00:00:00 2001 From: Nikhil Nagdev Date: Mon, 23 Dec 2019 00:51:31 +0530 Subject: [PATCH 1/4] Changed default time of datetime picker as current time Signed-off-by: Nikhil Nagdev --- js/functions.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/js/functions.js b/js/functions.js index 88263b60ff..de2cd8fe61 100644 --- a/js/functions.js +++ b/js/functions.js @@ -98,7 +98,13 @@ function PMA_addDatepicker ($this_element, type, options) { showTimepicker = false; } + // Getting the current Date and time + var currentDateTime = new Date(); + var defaultOptions = { + hour: currentDateTime.getHours(), + minute: currentDateTime.getMinutes(), + second: currentDateTime.getSeconds(), showOn: 'button', buttonImage: themeCalendarImage, // defined in js/messages.php buttonImageOnly: true, From 1f817e8690757a40ad65386f9b28fd5ff112a5cd Mon Sep 17 00:00:00 2001 From: William Desportes Date: Tue, 24 Dec 2019 23:39:28 +0100 Subject: [PATCH 2/4] Fix Uncaught TypeError on php 8.0 when adding a column to table create form "Uncaught TypeError: Expected parameter 1 to be an array, null given in tbl_columns_definition_form.inc.php:227" Signed-off-by: William Desportes --- libraries/tbl_columns_definition_form.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php index 9067e0a3b8..a0ce23cf26 100644 --- a/libraries/tbl_columns_definition_form.inc.php +++ b/libraries/tbl_columns_definition_form.inc.php @@ -217,7 +217,7 @@ for ($columnNumber = 0; $columnNumber < $num_fields; $columnNumber++) { ); $mime_map[$columnMeta['Field']] = array_merge( - $mime_map[$columnMeta['Field']], + isset($mime_map[$columnMeta['Field']]) ? $mime_map[$columnMeta['Field']] : [], array( 'mimetype' => Util::getValueByKey($_POST, "field_mimetype.${$columnNumber}"), 'transformation' => Util::getValueByKey( From b9e9346a21389d8c6cbcf35ad680f51aa32fe6f5 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Tue, 24 Dec 2019 23:40:44 +0100 Subject: [PATCH 3/4] Add ChangeLog entry for 1f817e8690757a Signed-off-by: William Desportes --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 145b377ebc..ac680bf825 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,7 @@ phpMyAdmin - ChangeLog - issue #15614 Fix undefined offset on index page for MySQL 5.7.8 (server charset) - issue #15692 Fix JavaScript error when user has not enough privilege to view query statistics. - issue #14248 Fixed date selection in search menu missing higher Z-index value +- issue Fix Uncaught php TypeError on php 8.0 when adding a column to table create form 4.9.2 (2019-11-21) - issue #14184 Change the cookie name from phpMyAdmin to phpMyAdmin_https for HTTPS, fixes many "Failed to set session cookie" errors From 5c00acf88f91835f3324833b8e5d02fad71227e7 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Tue, 24 Dec 2019 23:48:40 +0100 Subject: [PATCH 4/4] Add ChangeLog entry for #15682 Signed-off-by: William Desportes --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index ac680bf825..5e3f52ab40 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,7 @@ phpMyAdmin - ChangeLog - issue #15692 Fix JavaScript error when user has not enough privilege to view query statistics. - issue #14248 Fixed date selection in search menu missing higher Z-index value - issue Fix Uncaught php TypeError on php 8.0 when adding a column to table create form +- issue #15682 Fix calendar not taking current time as default value 4.9.2 (2019-11-21) - issue #14184 Change the cookie name from phpMyAdmin to phpMyAdmin_https for HTTPS, fixes many "Failed to set session cookie" errors