nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

undefined variable if AllowAnywhereRecoding is false

Browse Source
This commit is contained in:
Marc Delisle
2007-02-17 18:02:36 +00:00
parent f9059d8c95
commit 735de4b93c
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -9,6 +9,7 @@ $HeadURL$
* Documentation.html: patch #1659347, missing doc for some config, * Documentation.html: patch #1659347, missing doc for some config,
thanks to Isaac Bennetch thanks to Isaac Bennetch
* libraries/select_server.lib.php: avoid displaying a wide selector * 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> 2007-02-16 Marc Delisle <lem9@users.sourceforge.net>
* libraries/common.lib.php, footer.inc.php: avoid generating big links * libraries/common.lib.php, footer.inc.php: avoid generating big links

7
libraries/export/sql.php
View File

@@ -162,7 +162,8 @@ function PMA_exportFooter()
} }
// restore connection settings // 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])) { if (!empty($GLOBALS['asfile']) && isset($mysql_charset_map[$charset_of_file])) {
$foot .= $crlf $foot .= $crlf
. '/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;' . $crlf . '/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;' . $crlf
@@ -226,7 +227,7 @@ function PMA_exportHeader()
$head .= $crlf; $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])) { if (!empty($GLOBALS['asfile']) && isset($mysql_charset_map[$charset_of_file])) {
$head .= $crlf $head .= $crlf
. '/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;' . $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 * @param string Database name
* *