Merge branch 'QA_4_2' of github.com:phpmyadmin/phpmyadmin into QA_4_2

Conflicts:
	ChangeLog

1 files changed, 15 insertions, 4 deletions

diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js
index d057ae8a70..b601e95964 100644
--- a/js/server_status_monitor.js
+++ b/js/server_status_monitor.js
@@ -1290,10 +1290,10 @@ AJAX.registerOnload('server_status_monitor.js', function () {
     }
 
     function PMA_getLogAnalyseDialog(min, max) {
-        $('#logAnalyseDialog input[name="dateStart"]')
-            .val(PMA_formatDateTime(min, true));
-        $('#logAnalyseDialog input[name="dateEnd"]')
-            .val(PMA_formatDateTime(max, true));
+        var $dateStart = $('#logAnalyseDialog input[name="dateStart"]');
+        var $dateEnd = $('#logAnalyseDialog input[name="dateEnd"]');
+        $dateStart.val(PMA_formatDateTime(min, true));
+        $dateEnd.val(PMA_formatDateTime(max, true));
 
         var dlgBtns = { };
 
@@ -1312,6 +1312,17 @@ AJAX.registerOnload('server_status_monitor.js', function () {
             height: 'auto',
             buttons: dlgBtns
         });
+
+        PMA_addDatepicker($dateStart, 'datetime', {
+            showMillisec: false,
+            showMicrosec: false,
+            timeFormat: 'HH:mm:ss'
+        });
+        PMA_addDatepicker($dateEnd, 'datetime', {
+            showMillisec: false,
+            showMicrosec: false,
+            timeFormat: 'HH:mm:ss'
+        });
     }
 
     function loadLog(type, min, max) {