From 672075174479cfd272dd30ffae4bb3c97d3e1b1c Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sun, 8 Dec 2013 09:28:58 -0500 Subject: [PATCH] Fix undefined variable Signed-off-by: Marc Delisle --- libraries/sql.lib.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libraries/sql.lib.php b/libraries/sql.lib.php index 228023c08b..8cf8f99927 100644 --- a/libraries/sql.lib.php +++ b/libraries/sql.lib.php @@ -2272,9 +2272,10 @@ function PMA_executeQueryAndSendQueryResponse($analyzed_sql_results, $full_sql_query = $sql_query; // Handle remembered sorting order, only for single table query - // Handling is not required when its a union query + // Handling is not required when it's a union query + // (the parser never sets the 'union' key to 0) if (PMA_isRememberSortingOrder($analyzed_sql_results) - && $analyzed_sql_results['analyzed_sql'][0]['queryflags']['union']==null + && ! isset($analyzed_sql_results['analyzed_sql'][0]['queryflags']['union']) ) { PMA_handleSortOrder($db, $table, $analyzed_sql_results, $full_sql_query); }