Merge branch 'QA_4_6'

ChangeLog

@@ -103,6 +103,7 @@ phpMyAdmin - ChangeLog
 - issue #12454 Query history not updated in console until page refresh
 - issue #12344 Fixed parsing of labels in loop
 - issue #12228 Fixed parsing of BEGIN labels
+- issue #12637 Fixed editing some timestamp values
 
 4.6.4 (2016-08-16)
 - issue        [security] Weaknesses with cookie encryption, see PMASA-2016-29

js/functions.js

@@ -152,6 +152,8 @@ function PMA_addDatepicker($this_element, type, options)
     }
     else if (type == "time") {
         $this_element.timepicker($.extend(defaultOptions, options));
+        // Add a tip regarding entering MySQL allowed-values for TIME data-type
+        PMA_tooltip($this_element, 'input', PMA_messages.strMysqlAllowedValuesTip);
     }
 }
 
@@ -185,6 +187,11 @@ function addDateTimePicker() {
                 showMicrosec: showMicrosec,
                 timeFormat: timeFormat
             });
+
+            // Add a tip regarding entering MySQL allowed-values for TIME data-type
+            if ($(this).hasClass('timefield')) {
+                PMA_tooltip($(this), 'input', PMA_messages.strMysqlAllowedValuesTip);
+            }
         });
     }
 }

js/messages.php

@@ -522,6 +522,12 @@ $js_messages['strYes'] = __('Yes');
 $js_messages['strCopyEncryptionKey'] = __('Do you want to copy encryption key?');
 $js_messages['strEncryptionKey'] = __('Encryption key');
 
+/* For Tip to be shown on Time field */
+$js_messages['strMysqlAllowedValuesTip'] = __(
+    'MySQL accepts additional values not selectable by the slider;'
+    . ' key in those values directly if desired'
+);
+
 /* For Lock symbol Tooltip */
 $js_messages['strLockToolTip'] = __(
     'Indicates that you have made changes to this page;'

js/tbl_change.js

@@ -143,7 +143,7 @@ function isTime(val)
         }
     }
     val = arrayVal.join(":");
-    var tmexp = new RegExp(/^(([0-1][0-9])|(2[0-3])):((0[0-9])|([1-5][0-9])):((0[0-9])|([1-5][0-9]))(\.[0-9]{1,6}){0,1}$/);
+    var tmexp = new RegExp(/^(-)?(([0-7]?[0-9][0-9])|(8[0-2][0-9])|(83[0-8])):((0[0-9])|([1-5][0-9])):((0[0-9])|([1-5][0-9]))(\.[0-9]{1,6}){0,1}$/);
     return tmexp.test(val);
 }