undefined variable if AllowAnywhereRecoding is false
This commit is contained in:
@@ -9,6 +9,7 @@ $HeadURL$
|
||||
* Documentation.html: patch #1659347, missing doc for some config,
|
||||
thanks to Isaac Bennetch
|
||||
* libraries/select_server.lib.php: avoid displaying a wide selector
|
||||
* libraries/export/sql.php: undefined variable
|
||||
|
||||
2007-02-16 Marc Delisle <lem9@users.sourceforge.net>
|
||||
* libraries/common.lib.php, footer.inc.php: avoid generating big links
|
||||
|
@@ -162,7 +162,8 @@ function PMA_exportFooter()
|
||||
}
|
||||
|
||||
// restore connection settings
|
||||
$charset_of_file = $GLOBALS['charset_of_file'];
|
||||
// (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
|
||||
. '/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;' . $crlf
|
||||
@@ -226,7 +227,7 @@ function PMA_exportHeader()
|
||||
|
||||
$head .= $crlf;
|
||||
|
||||
$charset_of_file = $GLOBALS['charset_of_file'];
|
||||
$charset_of_file = isset($GLOBALS['charset_of_file']) ? $GLOBALS['charset_of_file'] : '';
|
||||
if (!empty($GLOBALS['asfile']) && isset($mysql_charset_map[$charset_of_file])) {
|
||||
$head .= $crlf
|
||||
. '/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;' . $crlf
|
||||
@@ -239,7 +240,7 @@ function PMA_exportHeader()
|
||||
}
|
||||
|
||||
/**
|
||||
* Outputs create database database
|
||||
* Outputs CREATE DATABASE database
|
||||
*
|
||||
* @param string Database name
|
||||
*
|
||||
|
Reference in New Issue
Block a user