Merge branch 'QA_4_3'

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>

1 files changed, 6 insertions, 4 deletions

diff --git a/js/multi_column_sort.js b/js/multi_column_sort.js
index e3c148b3c3..07825b48fa 100644
--- a/js/multi_column_sort.js
+++ b/js/multi_column_sort.js
@@ -37,7 +37,7 @@ function removeColumnFromMultiSort(target, parent)
     // If the given column is not part of the order clause exit from this function
     var index = parent.find('small').length ? parent.find('small').text() : '';
     if (index === ''){
-        return;
+        return '';
     }
     // Remove the current clicked column
     columns.splice(index-1, 1);
@@ -62,9 +62,11 @@ AJAX.registerOnload('keyhandler.js', function () {
         if (event.ctrlKey) {
             event.preventDefault();
             url = removeColumnFromMultiSort(url, $(this).parent());
-            AJAX.source = $(this);
-            PMA_ajaxShowMessage();
-            $.get(url, {'ajax_request' : true, 'ajax_page_request' : true}, AJAX.responseHandler);
+            if (url) {
+                AJAX.source = $(this);
+                PMA_ajaxShowMessage();
+                $.get(url, {'ajax_request' : true, 'ajax_page_request' : true}, AJAX.responseHandler);
+            }
         } else if (event.shiftKey) {
             event.preventDefault();
             AJAX.source = $(this);