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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2016-05-24 08:20:29 +02:00
commit 973e6b9e72
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/plugins/export/ExportSql.php
View File

@ -1478,7 +1478,9 @@ class ExportSql extends ExportPlugin
if ($tmp_error) {
$message = sprintf(__('Error reading structure for table %s:'), "$db.$table");
$message .= ' ' . $tmp_error;
trigger_error($message, E_USER_ERROR);
if (! defined('TESTSUITE')) {
trigger_error($message, E_USER_ERROR);
}
return $this->_exportComment($message);
}
@ -2188,7 +2190,9 @@ class ExportSql extends ExportPlugin
if ($tmp_error) {
$message = sprintf(__('Error reading data for table %s:'), "$db.$table");
$message .= ' ' . $tmp_error;
trigger_error($message, E_USER_ERROR);
if (! defined('TESTSUITE')) {
trigger_error($message, E_USER_ERROR);
}
return PMA_exportOutputHandler(
$this->_exportComment($message)
);

4
test/classes/plugin/export/ExportSqlTest.php
View File

@ -1175,7 +1175,7 @@ class ExportSqlTest extends PMATestCase
);
$this->assertContains(
'-- in use(error occurred)',
'-- Error reading structure for table db.table: error occurred',
$result
);
}
@ -1767,7 +1767,7 @@ class ExportSqlTest extends PMATestCase
$result = ob_get_clean();
$this->assertContains(
"-- Error reading data: (err)\n",
'-- Error reading data for table db.table: err',
$result
);
}