Index: thickbox.module
===================================================================
--- thickbox.module	(revision 1105)
+++ thickbox.module	(working copy)
@@ -171,15 +171,20 @@
  */
 function thickbox_field_formatter($field, $item, $formatter) {
   if (module_exists('imagefield') && module_exists('imagecache')) {
-    if (empty($item['fid'])) {
+    if (isset($item['filepath'])) {
+      $filepath = &$item['filepath'];
+    } else if (!empty($item['fid'])) {
+      $file = _imagefield_file_load($item['fid']);
+      $filepath = &$file['filepath'];
+    } else {
       return '';
     }
-    $file = _imagefield_file_load($item['fid']);
+    
     if (strpos($formatter, 'thickbox][') !== false) {
       list($null, $namespace) = explode('][', $formatter, 2);
       $rules = _imagecache_get_presets();
       if (in_array($namespace, (array) $rules)) {
-        return theme('imagefield_image_imagecache_thickbox', $namespace, $field, $file['filepath'], $item['alt'], $item['title']);
+        return theme('imagefield_image_imagecache_thickbox', $namespace, $field, $filepath, $item['alt'], $item['title']);
       }
     }
   }