From 96bd2a49788dab0d4a4b791b11faf44fa1be51a8 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sun, 16 Dec 2007 15:57:09 +0000
Subject: [PATCH] bug #1851833 [display] Sorting forgets an explicit LIMIT (fix
 for sorting on column headers)

---
 ChangeLog                   | 2 ++
 libraries/sqlparser.lib.php | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 704f91012..a6672f4f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -38,6 +38,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - bug #1817612 [cookies] Wrong cookie path on IIS with PHP-CGI,
   thanks to Carsten Wiedmann
 - bug #1848889 [export] export trigger should use DROP TRIGGER IF EXISTS
+- bug #1851833 [display] Sorting forgets an explicit LIMIT
+ (fix for sorting on column headers)
 
 2.11.3.0 (2007-12-08)
 - patch #1818389 to remove a notice (failed to flush buffer), thanks to
diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php
index ec7fab0fc..da3240a3a 100644
--- a/libraries/sqlparser.lib.php
+++ b/libraries/sqlparser.lib.php
@@ -1491,7 +1491,8 @@ if (! defined('PMA_MINIMUM_COMMON')) {
                 if ($upper_data == 'LIMIT') {
                     $in_limit = TRUE;
                     $limit_clause = '';
-                    $before_limit = FALSE;
+		    $before_limit = FALSE;
+                    $in_order_by = FALSE; // @todo maybe others to set FALSE
                 }
 
                 if ($upper_data == 'PROCEDURE') {
@@ -1673,7 +1674,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'