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

bug 731367

Browse Source
This commit is contained in:
Marc Delisle
2003-05-09 14:35:26 +00:00
parent 720a8fb359
commit 2636090111
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -5,6 +5,11 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2003-05-09 Marc Delisle <lem9@users.sourceforge.net>
* libraries/display_tbl.lib.php3: bug 731367: hexifying all
TEXT fields (a if on the type returns "blob") caused
problems
2003-05-05 Marc Delisle <lem9@users.sourceforge.net> 2003-05-05 Marc Delisle <lem9@users.sourceforge.net>
* libraries/build_dump.lib.php3: bug 731866: text fields were * libraries/build_dump.lib.php3: bug 731866: text fields were
exported hexified, because mysql_field_type() was used and exported hexified, because mysql_field_type() was used and

8
libraries/display_tbl.lib.php3
View File

@@ -917,6 +917,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
// "primary" key to use in links // "primary" key to use in links
if ($is_display['edit_lnk'] == 'ur' /* || $is_display['edit_lnk'] == 'dr' */) { if ($is_display['edit_lnk'] == 'ur' /* || $is_display['edit_lnk'] == 'dr' */) {
for ($i = 0; $i < $fields_cnt; ++$i) { for ($i = 0; $i < $fields_cnt; ++$i) {
$field_flags = PMA_mysql_field_flags($dt_result, $i);
$meta = $fields_meta[$i]; $meta = $fields_meta[$i];
// do not use an alias in a condition // do not use an alias in a condition
@@ -951,8 +952,10 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
|| (function_exists('is_null') && is_null($row[$pointer]))) { || (function_exists('is_null') && is_null($row[$pointer]))) {
$condition .= 'IS NULL AND'; $condition .= 'IS NULL AND';
} else { } else {
if ($meta->type == 'blob') { if ($meta->type == 'blob'
$condition .= 'LIKE 0x' . bin2hex($row[$pointer]). ' AND'; // hexify only if this is a true BLOB
&& eregi('BINARY', $field_flags)) {
$condition .= 'LIKE 0x' . bin2hex($row[$pointer]). ' AND';
} else { } else {
$condition .= '= \'' . PMA_sqlAddslashes($row[$pointer], FALSE, TRUE) . '\' AND'; $condition .= '= \'' . PMA_sqlAddslashes($row[$pointer], FALSE, TRUE) . '\' AND';
} }
@@ -1182,7 +1185,6 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
// TEXT fields type, however TEXT fields must be displayed // TEXT fields type, however TEXT fields must be displayed
// even if $cfg['ShowBlob'] is false -> get the true type // even if $cfg['ShowBlob'] is false -> get the true type
// of the fields. // of the fields.
$field_flags = PMA_mysql_field_flags($dt_result, $i);
if (eregi('BINARY', $field_flags)) { if (eregi('BINARY', $field_flags)) {
$blobtext = '[BLOB'; $blobtext = '[BLOB';