From cb60b4a750995a98b2464a056671651349533604 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 1 Mar 2017 12:41:07 +0100 Subject: [PATCH] Fixed displaying of all rows MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #13031 Signed-off-by: Michal Čihař --- ChangeLog | 1 + libraries/DisplayResults.php | 9 +++------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0898f5c72e..91a382df43 100644 --- a/ChangeLog +++ b/ChangeLog @@ -89,6 +89,7 @@ phpMyAdmin - ChangeLog - issue #13033 Use Referrer-Policy header to specify referrer policy - issue Fixed javascript confirmation of dangerous queries - issue #13040 Compatibility with hhvm 3.18 +- issue #13031 Fixed displaying of all rows 4.6.6 (2017-01-23) - issue #12759 Fix Notice regarding 'Undefined index: old_usergroup' diff --git a/libraries/DisplayResults.php b/libraries/DisplayResults.php index 18035cd950..d9e4c6826b 100644 --- a/libraries/DisplayResults.php +++ b/libraries/DisplayResults.php @@ -867,13 +867,10 @@ class DisplayResults } // Move to the next page or to the last one - $endpos = $_SESSION['tmpval']['pos'] - + $_SESSION['tmpval']['max_rows']; - if ($this->__get('unlim_num_rows') === false // view with unknown number of rows - || ($endpos < $this->__get('unlim_num_rows') - && $this->__get('num_rows') >= $_SESSION['tmpval']['max_rows'] - && $_SESSION['tmpval']['max_rows'] != self::ALL_ROWS) + || ($_SESSION['tmpval']['max_rows'] != self::ALL_ROWS + && $_SESSION['tmpval']['pos'] + $_SESSION['tmpval']['max_rows'] < $this->__get('unlim_num_rows') + && $this->__get('num_rows') >= $_SESSION['tmpval']['max_rows']) ) { $table_navigation_html