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

bug #1435303, error on empty BLOB transformation

Browse Source
This commit is contained in:
Marc Delisle
2006-02-22 12:52:30 +00:00
parent 59c480cd57
commit 1a55a28a2a
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2006-02-22 Marc Delisle <lem9@users.sourceforge.net>
* libraries/display_tbl.lib.php: bug #1435303, error on empty BLOB transf.
2006-02-22 Michal Čihař <michal@cihar.com> 2006-02-22 Michal Čihař <michal@cihar.com>
* libraries/iconv_wrapper.lib.php, libraries/charset_conversion.lib.php: * libraries/iconv_wrapper.lib.php, libraries/charset_conversion.lib.php:
Fixes for AIX wrapper, thanks to Björn Wiberg - bwiberg. Fixes for AIX wrapper, thanks to Björn Wiberg - bwiberg.

10
libraries/display_tbl.lib.php
View File

@@ -1295,13 +1295,17 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
if (!isset($row[$i]) || is_null($row[$i])) { if (!isset($row[$i]) || is_null($row[$i])) {
$blobtext .= ' - NULL'; $blobtext .= ' - NULL';
} elseif (isset($row[$i])) { } elseif (isset($row[$i])) {
$blob_size = PMA_formatByteDown(strlen($row[$i]), 3, 1); $blob_size = strlen($row[$i]);
$blobtext .= ' - '. $blob_size [0] . ' ' . $blob_size[1]; $display_blob_size = PMA_formatByteDown($blob_size, 3, 1);
unset($blob_size); $blobtext .= ' - '. $display_blob_size[0] . ' ' . $display_blob_size[1];
unset($display_blob_size);
} }
$blobtext .= ']'; $blobtext .= ']';
if ($blob_size > 0) {
$blobtext = ($default_function != $transform_function ? $transform_function($blobtext, $transform_options, $meta) : $default_function($blobtext, array(), $meta)); $blobtext = ($default_function != $transform_function ? $transform_function($blobtext, $transform_options, $meta) : $default_function($blobtext, array(), $meta));
}
unset($blob_size);
$vertical_display['data'][$row_no][$i] = ' <td align="center"' . $column_style . $bgcolor . '>' . $blobtext . '</td>'; $vertical_display['data'][$row_no][$i] = ' <td align="center"' . $column_style . $bgcolor . '>' . $blobtext . '</td>';
} else { } else {