Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: b54e5b0c4b600df9c88295e437e362ee005c7434 https://github.com/phpmyadmin/phpmyadmin/commit/b54e5b0c4b600df9c88295e437e3... Author: Michal Čihař <michal@cihar.com> Date: 2016-04-11 (Mon, 11 Apr 2016) Changed paths: M import.php M libraries/File.php M libraries/import.lib.php Log Message: ----------- Use File class for file imports Signed-off-by: Michal Čihař <michal@cihar.com> Commit: b4d53c1970f2ad27e0ae4074e65d9a9018b7cd58 https://github.com/phpmyadmin/phpmyadmin/commit/b4d53c1970f2ad27e0ae4074e65d... Author: Michal Čihař <michal@cihar.com> Date: 2016-04-11 (Mon, 11 Apr 2016) Changed paths: M libraries/File.php Log Message: ----------- Bring back move uploaded file logic from old import code Signed-off-by: Michal Čihař <michal@cihar.com> Commit: f90ca55a574ded2120488b9e11582c2e381faec4 https://github.com/phpmyadmin/phpmyadmin/commit/f90ca55a574ded2120488b9e1158... Author: Michal Čihař <michal@cihar.com> Date: 2016-04-11 (Mon, 11 Apr 2016) Changed paths: M import.php Log Message: ----------- Add missing error check Signed-off-by: Michal Čihař <michal@cihar.com> Commit: e408163aedaa46109acd0e2dd5fa4d9773a46ac8 https://github.com/phpmyadmin/phpmyadmin/commit/e408163aedaa46109acd0e2dd5fa... Author: Michal Čihař <michal@cihar.com> Date: 2016-04-11 (Mon, 11 Apr 2016) Changed paths: M ChangeLog M libraries/File.php Log Message: ----------- Improve performance of zip file import Avoid doing copies for every import chunk, rather use mb_strcut which allows us to parse stream by bytes, but doesn't cut multibyte chars. Signed-off-by: Michal Čihař <michal@cihar.com> Commit: e068339e90c910a0832618305c6f8ffb9498ddf6 https://github.com/phpmyadmin/phpmyadmin/commit/e068339e90c910a0832618305c6f... Author: Michal Čihař <michal@cihar.com> Date: 2016-04-11 (Mon, 11 Apr 2016) Changed paths: M libraries/import.lib.php Log Message: ----------- Fix import handle cleanup on error Signed-off-by: Michal Čihař <michal@cihar.com> Commit: bf2c76c1b1cc1504d381850e8e7d2cbd0066231b https://github.com/phpmyadmin/phpmyadmin/commit/bf2c76c1b1cc1504d381850e8e7d... Author: Michal Čihař <michal@cihar.com> Date: 2016-04-11 (Mon, 11 Apr 2016) Changed paths: M libraries/plugins/import/ImportLdi.php M libraries/plugins/import/ImportShp.php M test/classes/plugin/import/ImportCsvTest.php M test/classes/plugin/import/ImportLdiTest.php M test/classes/plugin/import/ImportMediawikiTest.php M test/classes/plugin/import/ImportOdsTest.php M test/classes/plugin/import/ImportShpTest.php M test/classes/plugin/import/ImportSqlTest.php M test/classes/plugin/import/ImportXmlTest.php Log Message: ----------- Adjust tests to new import code Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 2c9deb0b62c300b45cae42ff4c74e42b0dd7514c https://github.com/phpmyadmin/phpmyadmin/commit/2c9deb0b62c300b45cae42ff4c74... Author: Michal Čihař <michal@cihar.com> Date: 2016-04-11 (Mon, 11 Apr 2016) Changed paths: M libraries/plugins/import/ImportShp.php Log Message: ----------- Check zip file processing for errors Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 29fe4d12af0fabc9e97dbc5842c89cc5275b5f60 https://github.com/phpmyadmin/phpmyadmin/commit/29fe4d12af0fabc9e97dbc5842c8... Author: Michal Čihař <michal@cihar.com> Date: 2016-04-11 (Mon, 11 Apr 2016) Changed paths: M test/classes/plugin/import/ImportShpTest.php Log Message: ----------- Check import status in testcase Signed-off-by: Michal Čihař <michal@cihar.com> Commit: d4fdb956193df710d5589254ca40aeb58e529b82 https://github.com/phpmyadmin/phpmyadmin/commit/d4fdb956193df710d5589254ca40... Author: Michal Čihař <michal@cihar.com> Date: 2016-04-11 (Mon, 11 Apr 2016) Changed paths: M libraries/File.php M libraries/plugins/import/ImportShp.php Log Message: ----------- Adjust SHP file import to new code Signed-off-by: Michal Čihař <michal@cihar.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/9182a4d3a1f9...d4fdb956193d