diff -urp ori\thickbox.module new\thickbox.module
--- ori\thickbox.module	Sat May 17 18:40:09 2008
+++ new\thickbox.module	Mon Oct 13 17:59:58 2008
@@ -46,7 +46,7 @@ function thickbox_admin_settings() {
       '#type' => 'radios',
       '#title' => t('Image field gallery'),
       '#default_value' => variable_get('thickbox_imagefield_gallery', 0),
-      '#options' => array(0 => t('Per page gallery'), 1 => t('Per post gallery')),
+      '#options' => array(0 => t('Per page gallery'), 1 => t('Per post gallery'), 2 => t('Per imagecashe formatter')),
       '#description' => t('Should the gallery be images within a single post or all images on the page.'),
     );
   }
@@ -192,7 +192,13 @@ function thickbox_field_formatter($field
     $file = _imagefield_file_load($item['fid']);
     if (strpos($formatter, 'thickbox][') !== FALSE) {
       list($null, $namespace) = explode('][', $formatter, 2);
-      $gallery_id = variable_get('thickbox_imagefield_gallery', 0) == 0 ? $field['type_name'] : $item['nid'];
+      
+      switch (variable_get('thickbox_imagefield_gallery', 0)) {
+        case 0: $gallery_id = $field['type_name']; break;
+        case 1: $gallery_id = $item['nid']; break;
+        case 2: $gallery_id = $namespace;
+      }
+      
       if ($preset = imagecache_preset_by_name($namespace)) {
         return theme('imagefield_image_imagecache_thickbox', $namespace, $field, $file['filepath'], $item['alt'], $item['title'], $gallery_id);
       }