Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3

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

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">'