gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3

Browse Source
This commit is contained in:
Weblate 2015-01-14 15:00:23 +01:00
commit 1a242a44f5
6 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -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

2
libraries/plugins/schema/Export_Relation_Schema.class.php
View File

@ -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 "<p><strong>" . __("SCHEMA ERROR: ") . $type . "</strong></p>" . "\n";
if (!empty($error_message)) {

4
libraries/plugins/schema/dia/TableStatsDia.class.php
View File

@ -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(

4
libraries/plugins/schema/eps/TableStatsEps.class.php
View File

@ -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(

4
libraries/plugins/schema/pdf/TableStatsPdf.class.php
View File

@ -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(

4
libraries/plugins/schema/svg/TableStatsSvg.class.php
View File

@ -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(