Branch: refs/heads/QA_4_2 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 5f2adcb9caa921fba179107fc38c30b907e813d8 https://github.com/phpmyadmin/phpmyadmin/commit/5f2adcb9caa921fba179107fc38c... Author: Ashutosh Dhundhara ashutoshdhundhara@yahoo.com Date: 2014-08-29 (Fri, 29 Aug 2014)

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

Log Message: ----------- Bug #4527: Importing ODS files with column names having trailing spaces fails.

Signed-off-by: Ashutosh Dhundhara ashutoshdhundhara@yahoo.com

Commit: 54f80bfd7fe42720b7a3f349f79bdeb3d5e8c017 https://github.com/phpmyadmin/phpmyadmin/commit/54f80bfd7fe42720b7a3f349f79b... Author: Marc Delisle marc@infomarc.info Date: 2014-08-29 (Fri, 29 Aug 2014)

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

Log Message: ----------- Merge pull request #1347 from ashutoshdhundhara/bug_4527

Bug #4527: Importing ODS files with column names having trailing spaces fails.

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/d6cf9ebaaadf...54f80bfd7fe4