Branch: refs/heads/QA_4_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 310fd4b2c138321427e94fd7b92de987edda314d https://github.com/phpmyadmin/phpmyadmin/commit/310fd4b2c138321427e94fd7b92d... Author: Michal Čihař michal@cihar.com Date: 2016-02-16 (Tue, 16 Feb 2016)

Changed paths: M ChangeLog M libraries/plugins/import/ImportOds.class.php M libraries/plugins/import/ImportXml.class.php

Log Message: ----------- Fix PHP error on loading invalid XML or ODS file

Fixes #11967

Signed-off-by: Michal Čihař michal@cihar.com