[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-14150-g959abbc
Michal Čihař
nijel at users.sourceforge.net
Wed Aug 10 15:28:24 CEST 2011
The branch, master has been updated
via 959abbc89cbd73a4d5f0b73e90738134bba56e40 (commit)
from 65faeba99f6a07b87d2a0f62d354c3fe3545c31c (commit)
- Log -----------------------------------------------------------------
commit 959abbc89cbd73a4d5f0b73e90738134bba56e40
Author: Michal Čihař <mcihar at suse.cz>
Date: Wed Aug 10 15:27:40 2011 +0200
Sane handling of PDF rendering errors
Will now display proper error page instead of adding errors to top of
PDF output (if any).
-----------------------------------------------------------------------
Summary of changes:
libraries/PDF.class.php | 12 ++++++++++++
libraries/schema/Pdf_Relation_Schema.class.php | 12 ------------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/libraries/PDF.class.php b/libraries/PDF.class.php
index d0bb6f5..24429e3 100644
--- a/libraries/PDF.class.php
+++ b/libraries/PDF.class.php
@@ -71,4 +71,16 @@ class PMA_PDF extends TCPDF
}
parent::_putpages();
}
+
+ /**
+ * Displays an error message
+ *
+ * @param string $error_message the error mesage
+ */
+ function Error($error_message = '')
+ {
+ include('./libraries/header.inc.php');
+ PMA_Message::error(__('Error while creating PDF:') . ' ' . $error_message)->display();
+ include('./libraries/footer.inc.php');
+ }
}
diff --git a/libraries/schema/Pdf_Relation_Schema.class.php b/libraries/schema/Pdf_Relation_Schema.class.php
index 63e2307..4f354e6 100644
--- a/libraries/schema/Pdf_Relation_Schema.class.php
+++ b/libraries/schema/Pdf_Relation_Schema.class.php
@@ -154,18 +154,6 @@ class PMA_Schema_PDF extends PMA_PDF
$this->SetLineWidth($width);
}
- /**
- * Displays an error message
- *
- * @param string error_message the error mesage
- * @access public
- * @see PMA_Export_Relation_Schema::dieSchema
- */
- function Error($error_message = '')
- {
- PMA_Export_Relation_Schema::dieSchema($error_message);
- }
-
function Header()
{
// We only show this if we find something in the new pdf_pages table
hooks/post-receive
--
phpMyAdmin
More information about the Git
mailing list