diff --git a/ChangeLog b/ChangeLog
index 6a8a439e5..0f4d3637b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - bug #1789988 [display] space before SHOW COLUMNS 
 - bug #1831646 [table creation] Error in CREATE TABLE with multiple primary
   keys and AUTO_INCREMENT
+- [display] Division by zero when showing all records (page selector)
 
 2.11.2.1 (2007-11-11)
 - fixed possible SQL injection using database name
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index 22b0a89e6..c7046b587 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -355,10 +355,12 @@ onsubmit="return (checkFormElementInRange(this, 'session_max_rows', '<?php echo
 
 
     //page redirection
-    $pageNow = @floor($_SESSION['userconf']['pos'] / $_SESSION['userconf']['max_rows']) + 1;
-    $nbTotalPage = @ceil($unlim_num_rows / $_SESSION['userconf']['max_rows']);
+    // (unless we are showing all records)
+    if ('all' != $_SESSION['userconf']['max_rows']) { //if1
+        $pageNow = @floor($_SESSION['userconf']['pos'] / $_SESSION['userconf']['max_rows']) + 1;
+        $nbTotalPage = @ceil($unlim_num_rows / $_SESSION['userconf']['max_rows']);
 
-    if ($nbTotalPage > 1){ //if1
+        if ($nbTotalPage > 1){ //if2
        ?>
    <td>
        &nbsp;&nbsp;&nbsp;
@@ -385,10 +387,11 @@ onsubmit="return (checkFormElementInRange(this, 'session_max_rows', '<?php echo
         </form>
     </td>
         <?php
+        } //_if2
     } //_if1
 
 
-    // Show all the records if allowed
+    // Display the "Show all" button if allowed
     if ($GLOBALS['cfg']['ShowAll'] && ($num_rows < $unlim_num_rows)) {
         echo "\n";
         ?>