diff --git a/libraries/plugins/schema/dia/Dia_Relation_Schema.class.php b/libraries/plugins/schema/dia/Dia_Relation_Schema.class.php
index e51a716d1c..1c26ed7b6e 100644
--- a/libraries/plugins/schema/dia/Dia_Relation_Schema.class.php
+++ b/libraries/plugins/schema/dia/Dia_Relation_Schema.class.php
@@ -240,7 +240,7 @@ class PMA_Dia_Relation_Schema extends PMA_Export_Relation_Schema
         foreach ($alltables as $table) {
             if (! isset($this->tables[$table])) {
                 $this->_tables[$table] = new Table_Stats_Dia(
-                    $table, $this->pageNumber, $this->showKeys, $this->isOffline()
+                    $table, $this->pageNumber, $this->showKeys, $this->offline
                 );
             }
         }
@@ -301,7 +301,7 @@ class PMA_Dia_Relation_Schema extends PMA_Export_Relation_Schema
     {
         global $dia;
         $filename = $GLOBALS['db'] . '-' . $this->pageNumber;
-        if ($this->isOffline()) {
+        if ($this->offline) {
             $filename = __("Dia export page");
         }
         $dia->showOutput($filename);
diff --git a/libraries/plugins/schema/eps/Eps_Relation_Schema.class.php b/libraries/plugins/schema/eps/Eps_Relation_Schema.class.php
index 566fc63318..5c619c2bb7 100644
--- a/libraries/plugins/schema/eps/Eps_Relation_Schema.class.php
+++ b/libraries/plugins/schema/eps/Eps_Relation_Schema.class.php
@@ -358,7 +358,7 @@ class PMA_Eps_Relation_Schema extends PMA_Export_Relation_Schema
                 $this->_tables[$table] = new Table_Stats_Eps(
                     $table, $eps->getFont(), $eps->getFontSize(), $this->pageNumber,
                     $this->_tablewidth, $this->showKeys,
-                    $this->tableDimension, $this->isOffline()
+                    $this->tableDimension, $this->offline
                 );
             }
 
@@ -429,7 +429,7 @@ class PMA_Eps_Relation_Schema extends PMA_Export_Relation_Schema
     {
         global $eps;
         $filename = $GLOBALS['db'] . '-' . $this->pageNumber;
-        if ($this->isOffline()) {
+        if ($this->offline) {
             $filename = __("EPS export page");
         }
         $eps->showOutput($filename);
diff --git a/libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php b/libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php
index 26145dd211..49b442c0ad 100644
--- a/libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php
+++ b/libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php
@@ -53,25 +53,25 @@ class PMA_Schema_PDF extends PMA_PDF
     var $widths;
     private $_ff = PMA_PDF_FONT;
     private $_offline;
-    private $_exportingPage;
+    private $_pageNumber;
     private $_withDoc;
 
     /**
      * Constructs PDF for schema export.
      *
-     * @param string  $orientation   page orientation
-     * @param string  $unit          unit
-     * @param string  $paper         the format used for pages
-     * @param int     $exportingPage schema page number that is being exported
-     * @param boolean $withDoc       with document dictionary
+     * @param string  $orientation page orientation
+     * @param string  $unit        unit
+     * @param string  $paper       the format used for pages
+     * @param int     $pageNumber  schema page number that is being exported
+     * @param boolean $withDoc     with document dictionary
      *
      * @access public
      */
     public function __construct(
-        $orientation, $unit, $paper, $exportingPage, $withDoc
+        $orientation, $unit, $paper, $pageNumber, $withDoc
     ) {
         parent::__construct($orientation, $unit, $paper);
-        $this->_exportingPage = $exportingPage;
+        $this->_pageNumber = $pageNumber;
         $this->_withDoc = $withDoc;
     }
 
@@ -247,14 +247,14 @@ class PMA_Schema_PDF extends PMA_PDF
 
         // This function must be named "Header" to work with the TCPDF library
         if ($this->_withDoc) {
-            if ($this->_offline) {
+            if ($this->_offline || $this->_pageNumber == -1) {
                 $pg_name = __("PDF export page");
             } else {
                 $test_query = 'SELECT * FROM '
                     . PMA_Util::backquote($GLOBALS['cfgRelation']['db']) . '.'
                     . PMA_Util::backquote($GLOBALS['cfgRelation']['pdf_pages'])
                     . ' WHERE db_name = \'' . PMA_Util::sqlAddSlashes($GLOBALS['db'])
-                    . '\' AND page_nr = \'' . $this->_exportingPage . '\'';
+                    . '\' AND page_nr = \'' . $this->_pageNumber . '\'';
                 $test_rs = PMA_queryAsControlUser($test_query);
                 $pages = @$GLOBALS['dbi']->fetchAssoc($test_rs);
                 $pg_name = ucfirst($pages['page_descr']);
@@ -477,7 +477,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema
         $pdf->setCMargin(0);
         $pdf->Open();
         $pdf->SetAutoPageBreak('auto');
-        $pdf->setOffline($this->isOffline());
+        $pdf->setOffline($this->offline);
 
         $alltables = $this->getTablesFromRequest();
 
@@ -509,7 +509,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema
                     $this->_tablewidth,
                     $this->showKeys,
                     $this->tableDimension,
-                    $this->isOffline()
+                    $this->offline
                 );
             }
             if ($this->sameWide) {
@@ -841,7 +841,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema
         global $pdf;
 
         // Get the name of this pdfpage to use as filename
-        if ($this->isOffline()) {
+        if ($this->offline) {
             $filename = __("PDF export page") . '.pdf';
         } else {
             $_name_sql = 'SELECT page_descr FROM '
diff --git a/libraries/plugins/schema/svg/Svg_Relation_Schema.class.php b/libraries/plugins/schema/svg/Svg_Relation_Schema.class.php
index 585e21f7f2..935d43235e 100644
--- a/libraries/plugins/schema/svg/Svg_Relation_Schema.class.php
+++ b/libraries/plugins/schema/svg/Svg_Relation_Schema.class.php
@@ -331,7 +331,7 @@ class PMA_Svg_Relation_Schema extends PMA_Export_Relation_Schema
                 $this->_tables[$table] = new Table_Stats_Svg(
                     $table, $svg->getFont(), $svg->getFontSize(), $this->pageNumber,
                     $this->_tablewidth, $this->showKeys, $this->tableDimension,
-                    $this->isOffline()
+                    $this->offline
                 );
             }
 
@@ -402,7 +402,7 @@ class PMA_Svg_Relation_Schema extends PMA_Export_Relation_Schema
     {
         global $svg;
         $filename = $GLOBALS['db'] . '-' . $this->pageNumber;
-        if ($this->isOffline()) {
+        if ($this->offline) {
             $filename = __("SVG export page");
         }
         $svg->showOutput($filename);