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

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

Browse Source
This commit is contained in:
Weblate 2017-07-31 16:36:30 +02:00
commit 31797657c4
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -4,6 +4,7 @@ phpMyAdmin - ChangeLog
4.7.4 (not yet released)
- issue #13415 Remove shadow from the logo
- issue #13507 Fixed per server theme feature
- issue #13523 Missing newline in ALTER exports
4.7.3 (2017-07-20)
- issue #13447 Large multi-line query removes Export operation and blanks query box options

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

@ -1771,7 +1771,7 @@ class ExportSql extends ExportPlugin
$sql_auto_increments_query .= ', AUTO_INCREMENT='
. $statement->entityOptions->has('AUTO_INCREMENT');
}
$sql_auto_increments_query .= ';';
$sql_auto_increments_query .= ';' . $crlf;
$sql_auto_increments = $this->generateComment(
$crlf,