diff --git a/ChangeLog b/ChangeLog index 1b19c68cd..707abd667 100755 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,10 @@ $Id$ $Source$ +2006-07-19 Marc Delisle + * browse_foreigners.php: bug #1525393, no page selector in foreign key + browse page + 2006-07-19 Michal Čihař * libraries/compat/var_export.php: Update to fixed version. diff --git a/browse_foreigners.php b/browse_foreigners.php index a03e8e67e..ba995c0a6 100644 --- a/browse_foreigners.php +++ b/browse_foreigners.php @@ -55,19 +55,19 @@ if (isset($pk)) { $gotopage = ''; $showall = ''; +// $the_total comes from get_foreign.lib.php if (isset($disp_row) && is_array($disp_row)) { - $count = count( $disp_row ); - if ( $cfg['ShowAll'] && ($count > $per_page) ) { + if ( $cfg['ShowAll'] && ($the_total > $per_page) ) { $showall = ''; } $session_max_rows = $per_page; $pageNow = @floor($pos / $session_max_rows) + 1; - $nbTotalPage = @ceil($count / $session_max_rows); + $nbTotalPage = @ceil($the_total / $session_max_rows); - if ( $count > $per_page ) { + if ( $the_total > $per_page ) { $gotopage = PMA_pageselector( 'browse_foreigners.php?field=' . urlencode($field) . '&' . PMA_generate_common_url($db, $table)