[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5-6485-g1f248cc - Git

18 Aug 2010

The branch, master has been updated
       via  1f248cc2549a2f5c1a47d209f2062ccb1fa4682c (commit)
      from  d928804684fb9480ecc971b306bdbfbb309ede0f (commit)
- Log -----------------------------------------------------------------
commit 1f248cc2549a2f5c1a47d209f2062ccb1fa4682c
Author: Michal Čihař michal@cihar.com
Date:   Wed Aug 18 13:58:52 2010 +0200
Simplify code to use native tcpdf functions.
-----------------------------------------------------------------------
Summary of changes:
 libraries/export/pdf.php |   16 +---------------
 1 files changed, 1 insertions(+), 15 deletions(-)

diff --git a/libraries/export/pdf.php b/libraries/export/pdf.php
index 5bd4617..f478a11 100644
--- a/libraries/export/pdf.php
+++ b/libraries/export/pdf.php
@@ -45,17 +45,6 @@ class PMA_PDF extends TCPDF
     var $headerset;
     var $footerset;
-    // added because tcpdf for PHP 5 has a protected $buffer
-    public function getBuffer()
-    {
-        return $this->buffer;
-    }
-
-    public function getState()
-    {
-        return $this->state;
-    }
-
     // overloading of a tcpdf function:
     function _beginpage($orientation)
     {
@@ -466,10 +455,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query)
     $pdf->mysql_report($sql_query, $attr);
// instead of $pdf->Output():
-    if ($pdf->getState() < 3) {
-        $pdf->Close();
-    }
-    if (!PMA_exportOutputHandler($pdf->getBuffer())) {
+    if (!PMA_exportOutputHandler($pdf->getPDFData())) {
         return FALSE;
     }
hooks/post-receive
-- 
phpMyAdmin


    