From aea519fdedc5416002be687178942f6441644c71 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Wed, 14 Jan 2015 19:30:00 +0530 Subject: [PATCH] bug #4707 Call to undefined method PMA_Schema_PDF::dieSchema() Signed-off-by: Madhura Jayaratne --- ChangeLog | 1 + libraries/plugins/schema/Export_Relation_Schema.class.php | 2 +- libraries/plugins/schema/dia/TableStatsDia.class.php | 4 ++-- libraries/plugins/schema/eps/TableStatsEps.class.php | 4 ++-- libraries/plugins/schema/pdf/TableStatsPdf.class.php | 4 ++-- libraries/plugins/schema/svg/TableStatsSvg.class.php | 4 ++-- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index b20c5c5c97..5bc82d19a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ phpMyAdmin - ChangeLog - bug Null argument in array_multisort() - bug #4699 Navigation panel should not hide icons based on 'TableNavigationLinksMode' - bug #4703 Unsaved schema page exported as pdf.pdf +- bug #4707 Call to undefined method PMA_Schema_PDF::dieSchema() 4.3.6.0 (2015-01-07) - bug Undefined index notices while configuring recent and favorite tables diff --git a/libraries/plugins/schema/Export_Relation_Schema.class.php b/libraries/plugins/schema/Export_Relation_Schema.class.php index c1de4d0a69..7d7a7adeba 100644 --- a/libraries/plugins/schema/Export_Relation_Schema.class.php +++ b/libraries/plugins/schema/Export_Relation_Schema.class.php @@ -280,7 +280,7 @@ class PMA_Export_Relation_Schema * * @return void */ - function dieSchema($pageNumber, $type = '', $error_message = '') + public static function dieSchema($pageNumber, $type = '', $error_message = '') { echo "

" . __("SCHEMA ERROR: ") . $type . "

" . "\n"; if (!empty($error_message)) { diff --git a/libraries/plugins/schema/dia/TableStatsDia.class.php b/libraries/plugins/schema/dia/TableStatsDia.class.php index 81f86c1612..a3aabb5622 100644 --- a/libraries/plugins/schema/dia/TableStatsDia.class.php +++ b/libraries/plugins/schema/dia/TableStatsDia.class.php @@ -62,7 +62,7 @@ class Table_Stats_Dia extends TableStats */ protected function showMissingTableError() { - $this->diagram->dieSchema( + PMA_Export_Relation_Schema::dieSchema( $this->pageNumber, "DIA", sprintf(__('The %s table doesn\'t exist!'), $this->tableName) @@ -76,7 +76,7 @@ class Table_Stats_Dia extends TableStats */ protected function showMissingCoordinatesError() { - $this->diagram->dieSchema( + PMA_Export_Relation_Schema::dieSchema( $this->pageNumber, "DIA", sprintf( diff --git a/libraries/plugins/schema/eps/TableStatsEps.class.php b/libraries/plugins/schema/eps/TableStatsEps.class.php index 3e40627f9f..6643972272 100644 --- a/libraries/plugins/schema/eps/TableStatsEps.class.php +++ b/libraries/plugins/schema/eps/TableStatsEps.class.php @@ -75,7 +75,7 @@ class Table_Stats_Eps extends TableStats */ protected function showMissingTableError() { - $this->diagram->dieSchema( + PMA_Export_Relation_Schema::dieSchema( $this->pageNumber, "EPS", sprintf(__('The %s table doesn\'t exist!'), $this->tableName) @@ -89,7 +89,7 @@ class Table_Stats_Eps extends TableStats */ protected function showMissingCoordinatesError() { - $this->diagram->dieSchema( + PMA_Export_Relation_Schema::dieSchema( $this->pageNumber, "EPS", sprintf( diff --git a/libraries/plugins/schema/pdf/TableStatsPdf.class.php b/libraries/plugins/schema/pdf/TableStatsPdf.class.php index a20829ccc8..c45637dbce 100644 --- a/libraries/plugins/schema/pdf/TableStatsPdf.class.php +++ b/libraries/plugins/schema/pdf/TableStatsPdf.class.php @@ -76,7 +76,7 @@ class Table_Stats_Pdf extends TableStats */ protected function showMissingTableError() { - $this->diagram->dieSchema( + PMA_Export_Relation_Schema::dieSchema( $this->pageNumber, "PDF", sprintf(__('The %s table doesn\'t exist!'), $this->tableName) @@ -90,7 +90,7 @@ class Table_Stats_Pdf extends TableStats */ protected function showMissingCoordinatesError() { - $this->diagram->dieSchema( + PMA_Export_Relation_Schema::dieSchema( $this->pageNumber, "PDF", sprintf( diff --git a/libraries/plugins/schema/svg/TableStatsSvg.class.php b/libraries/plugins/schema/svg/TableStatsSvg.class.php index 7b421c318a..0fce77cbb5 100644 --- a/libraries/plugins/schema/svg/TableStatsSvg.class.php +++ b/libraries/plugins/schema/svg/TableStatsSvg.class.php @@ -76,7 +76,7 @@ class Table_Stats_Svg extends TableStats */ protected function showMissingTableError() { - $this->diagram->dieSchema( + PMA_Export_Relation_Schema::dieSchema( $this->pageNumber, "SVG", sprintf(__('The %s table doesn\'t exist!'), $this->tableName) @@ -90,7 +90,7 @@ class Table_Stats_Svg extends TableStats */ protected function showMissingCoordinatesError() { - $this->diagram->dieSchema( + PMA_Export_Relation_Schema::dieSchema( $this->pageNumber, "SVG", sprintf(