Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin

Conflicts:
	libraries/display_export.lib.php
	libraries/display_import.lib.php
This commit is contained in:
lorilee
2010-07-20 13:04:03 -07:00
329 changed files with 125970 additions and 127432 deletions

View File

@@ -4,7 +4,6 @@
* Set of functions used to build SQL dumps of tables
*
* @package phpMyAdmin-Export-SQL
* @version $Id$
*/
if (! defined('PHPMYADMIN')) {
exit;
@@ -238,7 +237,6 @@ function PMA_exportFooter()
}
// restore connection settings
// (not set if $cfg['AllowAnywhereRecoding'] is false)
$charset_of_file = isset($GLOBALS['charset_of_file']) ? $GLOBALS['charset_of_file'] : '';
if (!empty($GLOBALS['asfile']) && isset($mysql_charset_map[$charset_of_file])) {
$foot .= $crlf
@@ -327,8 +325,7 @@ function PMA_exportHeader()
// so that a utility like the mysql client can interpret
// the file correctly
if (isset($GLOBALS['charset_of_file']) && isset($mysql_charset_map[$GLOBALS['charset_of_file']])) {
// $cfg['AllowAnywhereRecoding'] was true so we got a charset from
// the export dialog
// we got a charset from the export dialog
$set_names = $mysql_charset_map[$GLOBALS['charset_of_file']];
} else {
// by default we use the connection charset