diff --git a/ChangeLog b/ChangeLog
index 8d3530696..1b70cf2b7 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2006-03-10 Marc Delisle  <lem9@users.sourceforge.net>
+    * libraries/display_tbl.lib.php: reactivate in-line image display
+
 2006-03-08 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/database_interface.lib.php, tbl_create.php,
       tbl_properties_operations.php: bug #1444892, TYPE deprecated in 
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index 0baf553e2..29a072eef 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -1302,8 +1302,11 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
                     }
 
                     $blobtext .= ']';
+                    if (strpos($transform_function, 'octetstream')) {
+                        $blobtext = $row[$i];
+                    }
                     if ($blob_size > 0) {
-                        $blobtext = ($default_function != $transform_function ? $transform_function($row[$i], $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);