From 6b50847a8c6672ebf3e8e93b02f9e2d0b1dcce48 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Thu, 29 Apr 2010 12:54:25 -0400 Subject: [PATCH] bug #2993970 Page numbering in Table of Contents --- ChangeLog | 1 + pdf_schema.php | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 20e1fed080..7772eb68e4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,6 +27,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug [edit] Avoid selecting UNHEX function by default for a BLOB column for which editing is protected - bug #2994168 [structure] Show auto_increment in uppercase +- bug #2993970 [pdf schema] Page numbering in Table of Contents 3.3.2.0 (2010-04-13) - patch #2969449 [core] Name for MERGE engine varies depending on the diff --git a/pdf_schema.php b/pdf_schema.php index 552ee321d1..ce87e97b28 100644 --- a/pdf_schema.php +++ b/pdf_schema.php @@ -1127,7 +1127,7 @@ function PMA_RT_DOC($alltables) $pdf->PMA_links['doc'][$table]['-'] = $pdf->AddLink(); $pdf->SetX(10); // $pdf->Ln(1); - $pdf->Cell(0, 6, $GLOBALS['strPageNumber'] . ' {' . sprintf("%02d", $i) . '}', 0, 0, 'R', 0, $pdf->PMA_links['doc'][$table]['-']); + $pdf->Cell(0, 6, $GLOBALS['strPageNumber'] . ' {' . sprintf("%02d", $i + 1) . '}', 0, 0, 'R', 0, $pdf->PMA_links['doc'][$table]['-']); $pdf->SetX(10); $pdf->Cell(0, 6, $i . ' ' . $table, 0, 1, 'L', 0, $pdf->PMA_links['doc'][$table]['-']); // $pdf->Ln(1); @@ -1143,9 +1143,9 @@ function PMA_RT_DOC($alltables) } $pdf->PMA_links['RT']['-'] = $pdf->AddLink(); $pdf->SetX(10); - $pdf->Cell(0, 6, $GLOBALS['strPageNumber'] . ' {00}', 0, 0, 'R', 0, $pdf->PMA_links['doc'][$lasttable]['-']); + $pdf->Cell(0, 6, $GLOBALS['strPageNumber'] . ' {' . sprintf("%02d", $i + 1) . '}', 0, 0, 'R', 0, $pdf->PMA_links['doc'][$lasttable]['-']); $pdf->SetX(10); - $pdf->Cell(0, 6, $i . ' ' . $GLOBALS['strRelationalSchema'], 0, 1, 'L', 0, $pdf->PMA_links['RT']['-']); + $pdf->Cell(0, 6, $i + 1 . ' ' . $GLOBALS['strRelationalSchema'], 0, 1, 'L', 0, $pdf->PMA_links['RT']['-']); $z = 0; foreach ($alltables AS $table) { $z++; -- 2.11.4.GIT