[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1405-ge3870e9

[Madhura Jayaratne]

The branch, master has been updated
       via  e3870e938edabc3cdd0f5c71fd9a2a87359f3271 (commit)
       via  cc7cd4eca883f6df996f9a3914ab1b6bb4132d91 (commit)
      from  251ecae49d17dafbccd802c1e004b8e8adffd01f (commit)


- Log -----------------------------------------------------------------
commit e3870e938edabc3cdd0f5c71fd9a2a87359f3271
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date:   Tue Jan 25 08:10:54 2011 +0530

    Avoid current page being reset to initial page when an empty table is encountered.

commit cc7cd4eca883f6df996f9a3914ab1b6bb4132d91
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date:   Tue Jan 25 00:28:52 2011 +0530

    To avoid php notices on undefined variables

-----------------------------------------------------------------------

Summary of changes:
 libraries/export/pdf.php                       |    2 +-
 libraries/schema/Pdf_Relation_Schema.class.php |    7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/libraries/export/pdf.php b/libraries/export/pdf.php
index f1aeb6d..8e2bd53 100644
--- a/libraries/export/pdf.php
+++ b/libraries/export/pdf.php
@@ -152,7 +152,7 @@ class PMA_PDF extends TCPDF
         // Now let's start to write the table
         $row = 0;
         $tmpheight = array();
-        $maxpage = 0;
+        $maxpage = $this->page;
 
         while ($data = PMA_DBI_fetch_row($this->results)) {
             $this->page = $currpage;
diff --git a/libraries/schema/Pdf_Relation_Schema.class.php b/libraries/schema/Pdf_Relation_Schema.class.php
index 73f075b..46644dc 100644
--- a/libraries/schema/Pdf_Relation_Schema.class.php
+++ b/libraries/schema/Pdf_Relation_Schema.class.php
@@ -979,14 +979,17 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema
      */
     private function _strokeGrid()
     {
-        global $pdf, $with_doc;
+        global $pdf;
 
         $gridSize = 10;
         $labelHeight = 4;
         $labelWidth = 5;
-        if ($with_doc) {
+        if ($this->withDoc) {
             $topSpace = 6;
             $bottomSpace = 15;
+        } else {
+            $topSpace = 0;
+            $bottomSpace = 0;
         }
 
         $pdf->SetMargins(0, 0);


hooks/post-receive
-- 
phpMyAdmin