Merge branch 'QA_5_0'

Signed-off-by: William Desportes <williamdes@wdes.fr>

ChangeLog

@@ -74,6 +74,7 @@ phpMyAdmin - ChangeLog
 - 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
 - issue #15636 Fix php error trying to access array offset on value o type null on replication GUI
+- issue #15695 Fix input field for the time in datetime picker is disabled
 
 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

js/functions.js

@@ -124,6 +124,7 @@ Functions.addDatepicker = function ($thisElement, type, options) {
     var currentDateTime = new Date();
 
     var defaultOptions = {
+        timeInput : true,
         hour: currentDateTime.getHours(),
         minute: currentDateTime.getMinutes(),
         second: currentDateTime.getSeconds(),

templates/display/import/javascript.twig

@@ -6,16 +6,16 @@ $( function() {
 
         {% if handler != 'PhpMyAdmin\\Plugins\\Import\\Upload\\UploadNoplugin' %}
             {# Some variable for javascript #}
-            {% set ajax_url = 'index.php?route=/import-status&id=' ~ upload_id ~ '&' ~ get_common_raw({
+            {% set ajax_url = 'index.php?route=/import-status&id=' ~ upload_id ~ get_common_raw({
                 'import_status': 1
-            }) %}
+            }, '&') %}
             {% set promot_str = 'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'|trans|js_format(false) %}
             {% set statustext_str = '%s of %s'|trans|escape_js_string %}
             {% set second_str = '%s/sec.'|trans|js_format(false) %}
             {% set remaining_min = 'About %MIN min. %SEC sec. remaining.'|trans|js_format(false) %}
             {% set remaining_second = 'About %SEC sec. remaining.'|trans|js_format(false) %}
             {% set processed_str = 'The file is being processed, please be patient.'|trans|js_format(false) %}
-            {% set import_url = get_common_raw({'import_status': 1}) %}
+            {% set import_url = get_common_raw({'import_status': 1}, '&') %}
 
             {% set upload_html %}
                 {% apply spaceless %}