diff options
| -rw-r--r-- | libraries/DisplayResults.class.php | 4 | ||||
| -rw-r--r-- | libraries/sql.lib.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php index da9e98fbe2..175dcf0f12 100644 --- a/libraries/DisplayResults.class.php +++ b/libraries/DisplayResults.class.php @@ -674,10 +674,10 @@ class PMA_DisplayResults || $this->__get('is_export') || $this->__get('is_func') || $this->__get('is_analyse')) - && !empty($analyzed_sql_results['queryflags']['select_from']) + && !empty($analyzed_sql_results['select_from']) && !empty($analyzed_sql_results['statement']->from) && (count($analyzed_sql_results['statement']->from) == 1) - && !empty($analyzed_sql_results['statement']->from[0]->table) == 1; + && !empty($analyzed_sql_results['statement']->from[0]->table); } diff --git a/libraries/sql.lib.php b/libraries/sql.lib.php index 6c767160ad..71704d6da6 100644 --- a/libraries/sql.lib.php +++ b/libraries/sql.lib.php @@ -1195,7 +1195,7 @@ function PMA_countQueryResults( // stop the query as soon as the result that is required has been // computed. - if (empty($analyzed_sql_results['queryflags']['union'])) { + if (empty($analyzed_sql_results['union'])) { $count_query .= ' LIMIT 1'; } |