From c43d60d1a4e0474ba295369b6c6ffec99df5109a Mon Sep 17 00:00:00 2001
From: Nisarg Jhaveri <nisarg.jhaveri@research.iiit.ac.in>
Date: Mon, 1 Dec 2014 10:30:06 -0500
Subject: [PATCH 1/2] Bug 4614 Missing separator

Signed-off-by: Marc Delisle <marc@infomarc.info>
---
 libraries/DisplayResults.class.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php
index fb3b9148a0..b7c0d84221 100644
--- a/libraries/DisplayResults.class.php
+++ b/libraries/DisplayResults.class.php
@@ -724,6 +724,12 @@ class PMA_DisplayResults
 
         } // end move toward
 
+        // show separator if pagination happen
+        if ($nbTotalPage > 1) {
+            $table_navigation_html
+                .= '<td><div class="navigation_separator">|</div></td>';
+        }
+
         // Display the "Show all" button if allowed
         if ($GLOBALS['cfg']['ShowAll'] || ($this->__get('unlim_num_rows') <= 500) ) {
 
@@ -731,13 +737,10 @@ class PMA_DisplayResults
                 $showing_all, $html_sql_query
             );
 
-        } // end show all
-
-        // show separator if pagination happen
-        if ($nbTotalPage > 1 || $showing_all) {
             $table_navigation_html
                 .= '<td><div class="navigation_separator">|</div></td>';
-        }
+
+        } // end show all
 
         $table_navigation_html .= '<td>'
             . '<div class="save_edited hide">'

From a117cb2552823f02fd03fb75210c05fd105495e2 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Mon, 1 Dec 2014 10:31:02 -0500
Subject: [PATCH 2/2] ChangeLog entry

Signed-off-by: Marc Delisle <marc@infomarc.info>
---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog b/ChangeLog
index f2fd212b53..7d764e0f23 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@ phpMyAdmin - ChangeLog
 - bug #4609 'Show all' checkbox label is not clickable
 - bug #4610 JS error reporting: Hash fragment is reset
 - bug       Undefined index menuswork
+- bug #4614 Separator between "Show All" and "Number of rows" disappears
 
 4.3.0.0 (not yet released)
 + rfe #1502 Smart sorting for int keys