From bfa700be7a1ea5a164f45c324a12c4923b2b936c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@suse.cz>
Date: Mon, 24 Jun 2013 15:28:50 +0200
Subject: [PATCH 1/2] Add some spacing

---
 libraries/DisplayResults.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php
index 6278abe7fd..a8030301d2 100644
--- a/libraries/DisplayResults.class.php
+++ b/libraries/DisplayResults.class.php
@@ -908,9 +908,9 @@ class PMA_DisplayResults
             . __('Number of rows:') . ' '
             . '<select name="session_max_rows" class="autosubmit">';
 
-        $numberOfRowsChoices = array(25,50,100,250,500);
+        $numberOfRowsChoices = array(25, 50, 100, 250, 500);
         foreach ($numberOfRowsChoices as $oneNumberOfRowsChoice) {
-            $additional_fields_html .= '<option value="' 
+            $additional_fields_html .= '<option value="'
                 . $oneNumberOfRowsChoice . '"';
 
             if ($oneNumberOfRowsChoice == $_SESSION['tmp_user_values']['max_rows']) {

From b0f322eab740e3d7ec4def8efd1b2e4f3e0ee85e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@suse.cz>
Date: Mon, 24 Jun 2013 15:30:04 +0200
Subject: [PATCH 2/2] Drop ShowAll dependency on MaxRows

It does not make sense since we now allow to choose up to 500 rows in
dropdown.
---
 doc/config.rst                     | 7 +++----
 libraries/DisplayResults.class.php | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/doc/config.rst b/doc/config.rst
index 30b6613bea..5b9657c8c7 100644
--- a/doc/config.rst
+++ b/doc/config.rst
@@ -1550,10 +1550,9 @@ Browse mode
     :type: boolean
     :default: false
 
-    Defines whether a user should be displayed a "Show all" button in
-    browse mode or not in all cases. By default it is shown only on small
-    tables (less than 5 × :config:option:`$cfg['MaxRows']` rows) to avoid
-    performance issues while getting too many rows.
+    Defines whether a user should be displayed a "Show all" button in browse
+    mode or not in all cases. By default it is shown only on small tables (less
+    than 500 rows) to avoid performance issues while getting too many rows.
 
 .. config:option:: $cfg['MaxRows']
 
diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php
index a8030301d2..7ca196adf3 100644
--- a/libraries/DisplayResults.class.php
+++ b/libraries/DisplayResults.class.php
@@ -666,7 +666,7 @@ class PMA_DisplayResults
         // Display the "Show all" button if allowed
         if (($this->__get('num_rows') < $this->__get('unlim_num_rows'))
             && ($GLOBALS['cfg']['ShowAll']
-            || ($GLOBALS['cfg']['MaxRows'] * 5 >= $this->__get('unlim_num_rows')))
+            || ($this->__get('unlim_num_rows') <= 500))
         ) {
 
             $table_navigation_html .= $this->_getShowAllButtonForTableNavigation(