bug #1525393, no page selector in foreign key browse page

This commit is contained in:
Marc Delisle
2006-07-19 15:59:26 +00:00
parent 126dd8dd3b
commit 506e938ff0
2 changed files with 8 additions and 4 deletions

View File

@@ -6,6 +6,10 @@ $Id$
$Source$ $Source$
2006-07-19 Marc Delisle <lem9@users.sourceforge.net>
* browse_foreigners.php: bug #1525393, no page selector in foreign key
browse page
2006-07-19 Michal Čihař <michal@cihar.com> 2006-07-19 Michal Čihař <michal@cihar.com>
* libraries/compat/var_export.php: Update to fixed version. * libraries/compat/var_export.php: Update to fixed version.

View File

@@ -55,19 +55,19 @@ if (isset($pk)) {
$gotopage = ''; $gotopage = '';
$showall = ''; $showall = '';
// $the_total comes from get_foreign.lib.php
if (isset($disp_row) && is_array($disp_row)) { 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 = '<input type="submit" name="foreign_navig" value="' . $strShowAll . '" />'; $showall = '<input type="submit" name="foreign_navig" value="' . $strShowAll . '" />';
} }
$session_max_rows = $per_page; $session_max_rows = $per_page;
$pageNow = @floor($pos / $session_max_rows) + 1; $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( $gotopage = PMA_pageselector(
'browse_foreigners.php?field=' . urlencode($field) . 'browse_foreigners.php?field=' . urlencode($field) .
'&amp;' . PMA_generate_common_url($db, $table) '&amp;' . PMA_generate_common_url($db, $table)