From ed32527de04ab73c5868ff0b1ca53392b93455b1 Mon Sep 17 00:00:00 2001 From: Rakesh Kumar Date: Wed, 24 Dec 2014 23:01:29 +0530 Subject: [PATCH 1/2] fix bug #4672 Signed-off-by: Rakesh Kumar --- libraries/DisplayResults.class.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php index 3004974bc3..0ffdf52be5 100644 --- a/libraries/DisplayResults.class.php +++ b/libraries/DisplayResults.class.php @@ -373,6 +373,7 @@ class PMA_DisplayResults $db = $this->__get('db'); $table = $this->__get('table'); $unlim_num_rows = $this->__get('unlim_num_rows'); + $num_rows = $this->__get('num_rows'); $fields_meta = $this->__get('fields_meta'); $printview = $this->__get('printview'); @@ -514,6 +515,11 @@ class PMA_DisplayResults $the_total = PMA_Table::countRecords($db, $table); } + // if for COUNT query, number of rows returned more than 1 (may be being used GROUP BY) + if ($this->__get('is_count') && isset($num_rows) && $num_rows > 1) { + $do_display['nav_bar'] = (string) '1'; + $do_display['sort_lnk'] = (string) '1'; + } // 4. If navigation bar or sorting fields names URLs should be // displayed but there is only one row, change these settings to // false From 6fab2c158eafbb2f00a3af09111f2ba19370d30a Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 24 Dec 2014 13:45:30 -0500 Subject: [PATCH 2/2] ChangeLog entry Signed-off-by: Marc Delisle --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 12f6bbae88..a94857f88f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ phpMyAdmin - ChangeLog - bug #4642 phpmyadmin often fails to load due to specific load order - bug #4671 Unable to move all columns - bug #4645 Import of export created with mysqldump +- bug #4672 "Distinct values" does not page 4.3.3.0 (2014-12-21) - bug The "Recently used tables" setting should be with Nav panel