Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: db5f9a9f513c64b3e4fd042fa17dbee4a9c8acdd https://github.com/phpmyadmin/phpmyadmin/commit/db5f9a9f513c64b3e4fd042fa17d... Author: Alex Marin alex.ukf@gmail.com Date: 2012-04-16 (Mon, 16 Apr 2012)

Changed paths: M libraries/export/xml.php

Log Message: ----------- fix original column names in export xml

Inside pma:table the column names contained spaces, but in the <column> tags, they were replaced with underscores, causing a mismatch.

Commit: e13706fd3ec3666ce6afa6e722b7c02e318c26bc https://github.com/phpmyadmin/phpmyadmin/commit/e13706fd3ec3666ce6afa6e722b7... Author: Alex Marin alex.ukf@gmail.com Date: 2012-04-16 (Mon, 16 Apr 2012)

Changed paths: M libraries/import.lib.php

Log Message: ----------- fix replace statements for tables containing TABLE in their names

Commit: 6a7560d9c9dbd4193fb2ecf43142a4d10052394c https://github.com/phpmyadmin/phpmyadmin/commit/6a7560d9c9dbd4193fb2ecf43142... Author: Alex Marin alex.ukf@gmail.com Date: 2012-04-16 (Mon, 16 Apr 2012)

Changed paths: M libraries/plugin_interface.lib.php

Log Message: ----------- include import and export plugins only once

Commit: aa861498195d4ebae1e5ebb95cf0a97b3dcc5249 https://github.com/phpmyadmin/phpmyadmin/commit/aa861498195d4ebae1e5ebb95cf0... Author: Marc Delisle marc@infomarc.info Date: 2012-04-17 (Tue, 17 Apr 2012)

Changed paths: M libraries/export/xml.php M libraries/import.lib.php M libraries/plugin_interface.lib.php

Log Message: ----------- Merge pull request #35 from alexukf/fixes

import-export related fixes

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/033a502...aa86149