Merge branch 'QA_4_3'

ChangeLog

@@ -15,6 +15,7 @@ phpMyAdmin - ChangeLog
 - bug #4646 Version Check Broken
 - bug #4630 AJAX request infinite loop
 - bug #4649 Attributes field size smaller than others
+- bug #4622 Cannot remove table ordering on a Mac
 
 4.3.2.0 (2014-12-12)
 - bug #4628 PHP error while exporting schema as PDF

js/messages.php

@@ -424,7 +424,7 @@ $js_messages['strCellEditHint'] = __('Press escape to cancel editing.');
 $js_messages['strSaveCellWarning'] = __('You have edited some data and they have not been saved. Are you sure you want to leave this page before saving the data?');
 $js_messages['strColOrderHint'] = __('Drag to reorder.');
 $js_messages['strSortHint'] = __('Click to sort results by this column.');
-$js_messages['strMultiSortHint'] = __('Shift+Click to add this column to ORDER BY clause or to toggle ASC/DESC.<br />- Control+Click to remove column from ORDER BY clause');
+$js_messages['strMultiSortHint'] = __('Shift+Click to add this column to ORDER BY clause or to toggle ASC/DESC.<br />- Ctrl+Click or Alt+Click (Mac: Shift+Option+Click) to remove column from ORDER BY clause');
 $js_messages['strColMarkHint'] = __('Click to mark/unmark.');
 $js_messages['strColNameCopyHint'] = __('Double-click to copy column name.');
 $js_messages['strColVisibHint'] = __(

js/multi_column_sort.js

@@ -59,7 +59,7 @@ function removeColumnFromMultiSort(target, parent)
 AJAX.registerOnload('keyhandler.js', function () {
     $("th.draggable.column_heading.pointer.marker a").on('click', function (event) {
         var url = $(this).parent().find('input').val();
-        if (event.ctrlKey) {
+        if (event.ctrlKey || event.altKey) {
             event.preventDefault();
             url = removeColumnFromMultiSort(url, $(this).parent());
             if (url) {