Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 3b285ddc3a88c5e9aae21265511421aef0f66f25 https://github.com/phpmyadmin/phpmyadmin/commit/3b285ddc3a88c5e9aae212655114... Author: Maurício Meneghini Fauth mauricio@fauth.dev Date: 2020-08-16 (Sun, 08 August 2020) -03:00

Changed paths: M ChangeLog M export.php M libraries/classes/File.php M libraries/classes/Plugins/Import/ImportShp.php M libraries/classes/ZipExtension.php M test/classes/ZipExtensionTest.php

Log Message: ----------- Fix PHP error when exporting without php-zip

Fixes #14326 (Export database with zip compression: Class 'ZipArchive' not found error).

Signed-off-by: Maurício Meneghini Fauth mauricio@fauth.dev

Commit: 9d6bc6f641ca33cdb5fd1008b813c8b096d78ec5 https://github.com/phpmyadmin/phpmyadmin/commit/9d6bc6f641ca33cdb5fd1008b813... Author: Maurício Meneghini Fauth mauricio@fauth.dev Date: 2020-08-16 (Sun, 08 August 2020) -03:00

Changed paths: M ChangeLog M libraries/classes/Controllers/ExportController.php M libraries/classes/File.php M libraries/classes/Plugins/Import/ImportShp.php M libraries/classes/ZipExtension.php M test/classes/ZipExtensionTest.php

Log Message: ----------- Merge branch 'QA_5_0'

Signed-off-by: Maurício Meneghini Fauth mauricio@fauth.dev