Merge branch 'QA_3_3'

This commit is contained in:
Marc Delisle
2010-04-29 12:54:55 -04:00
2 changed files with 4 additions and 3 deletions

View File

@@ -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

View File

@@ -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++;