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

Merge branch 'QA_4_6'

Browse Source
This commit is contained in:
Michal Čihař 2016-02-16 10:21:19 +01:00
commit edc46f02e9
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -81,6 +81,7 @@ phpMyAdmin - ChangeLog
- issue #11964 Undefined index: TABLE_COMMENT in database structure page
- issue #11967 Fix PHP error on loading invalid XML or ODS file
- issue #11969 Missing confirmation while dropping a view in view_operations.php
- issue #11968 Fix export of index comments in SQL
4.5.4.1 (2016-01-29)
- issue #11892 Error with PMA 4.4.15.3

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

@ -1632,7 +1632,9 @@ class ExportSql extends ExportPlugin
unset($statement->fields[$key]);
} else {
if (empty($GLOBALS['sql_if_not_exists'])) {
$indexes[] = $field->build($field);
$indexes[] = str_replace(
'COMMENT=\'', 'COMMENT \'', $field::build($field)
);
unset($statement->fields[$key]);
}
}