Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 1b43606a48bb6260aa9223fbb82547784ce6a3e8 https://github.com/phpmyadmin/phpmyadmin/commit/1b43606a48bb6260aa9223fbb825... Author: Michal Čihař <michal@cihar.com> Date: 2016-03-18 (Fri, 18 Mar 2016) Changed paths: M ChangeLog M libraries/plugins/export/ExportSql.php M test/classes/plugin/export/ExportSqlTest.php Log Message: ----------- Fixed possible invalid SQL export We should emit the charset restoration only if we have emitted its setting in the header. As the condition was slightly different in both cases it was possible that only one part of these two was emitted in past. Fixes #12074 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 8a5bf72775782306cb42415321e09e5cdc494cf1 https://github.com/phpmyadmin/phpmyadmin/commit/8a5bf72775782306cb42415321e0... Author: Michal Čihař <michal@cihar.com> Date: 2016-03-18 (Fri, 18 Mar 2016) Changed paths: M ChangeLog M libraries/plugins/export/ExportSql.php M test/classes/plugin/export/ExportSqlTest.php Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/48b444fc2162...8a5bf7277578