Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-10-27 09:52:23 +01:00
commit 1a20138c50
2 changed files with 6 additions and 6 deletions

View File

@ -18,6 +18,8 @@ phpMyAdmin - ChangeLog
- issue #11597 Huge binary log growth on 4.5.x
- issue #11594 'only_db' config option bug when db names contain underscore and are grouped
- issue #11607 Unable to change password from Login information tab
- issue #11610 Undefined variable: res_rel
- issue #11611 Warning while exporting schema to PDF
4.5.1.0 (2015-10-23)
- issue Invalid argument supplied for foreach()

View File

@ -584,12 +584,10 @@ class PdfRelationSchema extends ExportRelationSchema
* Gets fields properties
*/
$columns = $GLOBALS['dbi']->getColumns($this->db, $table);
// Check if we can use Relations
if (!empty($cfgRelation['relation'])) {
// Find which tables are related with the current one and write it in
// an array
$res_rel = PMA_getForeigners($this->db, $table);
} // end if
// Find which tables are related with the current one and write it in
// an array
$res_rel = PMA_getForeigners($this->db, $table);
/**
* Displays the comments of the table if MySQL >= 3.23