Merge branch 'QA_5_0'

Signed-off-by: William Desportes <williamdes@wdes.fr>
This commit is contained in:
William Desportes 2019-12-25 00:09:16 +01:00
commit 56f345f9b3
No known key found for this signature in database
GPG Key ID: 90A0EF1B8251A889
3 changed files with 9 additions and 1 deletions

View File

@ -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

View File

@ -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,

View File

@ -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(