diff --git a/ChangeLog b/ChangeLog index 7993082def..5a286e12ef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -70,6 +70,8 @@ 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 +- 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 diff --git a/js/functions.js b/js/functions.js index 567e3deed4..61a3afd54b 100644 --- a/js/functions.js +++ b/js/functions.js @@ -120,7 +120,13 @@ Functions.addDatepicker = function ($thisElement, 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: pmaThemeImage + 'b_calendar.png', buttonImageOnly: true, diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php index 36a1b61c70..8c58c9409e 100644 --- a/libraries/tbl_columns_definition_form.inc.php +++ b/libraries/tbl_columns_definition_form.inc.php @@ -271,7 +271,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']] : [], [ 'mimetype' => Util::getValueByKey($_POST, "field_mimetype.${columnNumber}"), 'transformation' => Util::getValueByKey(