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

bug 1667466, undefined variable when export + save on server

Browse Source
This commit is contained in:
Marc Delisle
2007-02-25 12:39:38 +00:00
parent 4580f48e8d
commit cff19a334a
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - ChangeLog
$Id$ $Id$
$HeadURL$ $HeadURL$
2007-02-25 Marc Delisle <lem9@users.sourceforge.net>
* libraries/common.lib.php: bug #1667466, undefined variable when
export + save on server
2007-02-24 Marc Delisle <lem9@users.sourceforge.net> 2007-02-24 Marc Delisle <lem9@users.sourceforge.net>
* libraries/config.default.php: RFE #1621437, HEX and UNHEX were not * libraries/config.default.php: RFE #1621437, HEX and UNHEX were not
available for a BINARY field available for a BINARY field

5
libraries/common.lib.php
View File

@@ -1185,8 +1185,11 @@ if (typeof(window.parent) != 'undefined'
$sql_query = $GLOBALS['display_query']; $sql_query = $GLOBALS['display_query'];
} elseif ($cfg['SQP']['fmtType'] == 'none' && ! empty($GLOBALS['unparsed_sql'])) { } elseif ($cfg['SQP']['fmtType'] == 'none' && ! empty($GLOBALS['unparsed_sql'])) {
$sql_query = $GLOBALS['unparsed_sql']; $sql_query = $GLOBALS['unparsed_sql'];
} else { // could be empty, for example export + save on server
} elseif (! empty($GLOBALS['sql_query'])) {
$sql_query = $GLOBALS['sql_query']; $sql_query = $GLOBALS['sql_query'];
} else {
$sql_query = '';
} }
} }