refactor display_export.lib.php
Fix merge conflict
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin