[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2-2101-g89c08b4

The branch, master has been updated via 89c08b468b5fb206bc304b26d36d76a2d3390b8d (commit) via 6b50847a8c6672ebf3e8e93b02f9e2d0b1dcce48 (commit) from 43d80c678b114478276f0a32d2a60627e1ff796c (commit) - Log ----------------------------------------------------------------- commit 89c08b468b5fb206bc304b26d36d76a2d3390b8d Merge: 43d80c678b114478276f0a32d2a60627e1ff796c 6b50847a8c6672ebf3e8e93b02f9e2d0b1dcce48 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Apr 29 12:54:55 2010 -0400 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + pdf_schema.php | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 278d923..a7bc8ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -104,6 +104,7 @@ $Id$ - 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 2306a15..79b3c25 100644 --- a/pdf_schema.php +++ b/pdf_schema.php @@ -1123,7 +1123,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); @@ -1139,9 +1139,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++; hooks/post-receive -- phpMyAdmin