bug #1851833 [display] Sorting forgets an explicit LIMIT (fix for sorting on column headers)

libraries/sqlparser.lib.php

@@ -1495,6 +1495,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
                     $in_limit = TRUE;
                     $limit_clause = '';
                     $before_limit = FALSE;
+                    $in_order_by = FALSE; // @todo maybe others to set FALSE
                 }
 
                 if ($upper_data == 'PROCEDURE') {
@@ -1676,7 +1677,8 @@ if (! defined('PMA_MINIMUM_COMMON')) {
 
             if (isset($subresult['queryflags']['select_from'])
              && $subresult['queryflags']['select_from'] == 1
-             && !$seen_order) {
+             && ! $in_order_by
+	     && $upper_data != 'ORDER') {
                 $unsorted_query .= $arr[$i]['data'];
 
                 if ($arr[$i]['type'] != 'punct_bracket_open_round'