Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 310fd4b2c138321427e94fd7b92de987edda314d
https://github.com/phpmyadmin/phpmyadmin/commit/310fd4b2c138321427e94fd7b92de987edda314d
Author: Michal Čihař <mic...@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ř <mic...@cihar.com>
Commit: 9a590a0b764e8cf79f650658e695c4ce35336d35
https://github.com/phpmyadmin/phpmyadmin/commit/9a590a0b764e8cf79f650658e695c4ce35336d35
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-02-16 (Tue, 16 Feb 2016)
Changed paths:
M ChangeLog
M libraries/plugins/import/ImportOds.php
M libraries/plugins/import/ImportXml.php
Log Message:
-----------
Merge branch 'QA_4_5' into QA_4_6
Commit: d8482d1644df093409a904c81712a8cc801e97db
https://github.com/phpmyadmin/phpmyadmin/commit/d8482d1644df093409a904c81712a8cc801e97db
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-02-16 (Tue, 16 Feb 2016)
Changed paths:
M ChangeLog
M libraries/plugins/import/ImportOds.php
M libraries/plugins/import/ImportXml.php
Log Message:
-----------
Merge branch 'QA_4_6'
Compare:
https://github.com/phpmyadmin/phpmyadmin/compare/566caa514364...d8482d1644df_______________________________________________
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git
