diff --git a/ChangeLog b/ChangeLog index fb4ab5d87..2a7643985 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,9 @@ phpMyAdmin - Changelog $Id$ $Source$ +2006-03-16 Marc Delisle + * libraries/display_tbl.lib.php: undefined variable when a BLOB is NULL + 2006-03-16 Michal Čihař * libraries/select_server.lib.php: Move end of fieldset to correct place after button (patch #1450559). diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 29a072eef..1d67640cb 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -1294,6 +1294,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { $blobtext = '[BLOB'; if (!isset($row[$i]) || is_null($row[$i])) { $blobtext .= ' - NULL'; + $blob_size = 0; } elseif (isset($row[$i])) { $blob_size = strlen($row[$i]); $display_blob_size = PMA_formatByteDown($blob_size, 3, 1);