--- imagepicker.module.org	2009-05-19 13:00:34.000000000 +0100
+++ imagepicker.module	2009-06-11 22:11:50.000000000 +0100
@@ -270,6 +270,13 @@
     $weight = 1;
   }
   if (user_access('use imagepicker')) {
+    if (variable_get('imagepicker_advanced_thickbox', 0)) {
+      $iurl = l('Run imagepicker', 'imagepicker' );
+    }
+    else {
+      $iurl = '<iframe id="imagepicker" style="width: '. variable_get('imagepicker_advanced_iframe_width', "100%") .'; height: '. variable_get('imagepicker_advanced_iframe_height', 500) .'px; border: '. variable_get('imagepicker_advanced_iframe_border', "0") .';" src="'. url('imagepicker') .'">Imagepicker requires iframe support.</iframe>';
+    }
+
     if (($node_type && preg_match('/node_form$/i', $form_id) ) || $comment ) {
       $form['body_field']['body_filter']['file_upload'] = array(
         '#type' => 'fieldset',
@@ -281,7 +289,7 @@
       $form['body_field']['body_filter']['#weight'] = 2;
       $form['body_field']['body_filter']['file_upload']['mpframe'] = array(
         '#type' => 'markup',
-        '#value' => '<div><iframe id="imagepicker" style="width: '. variable_get('imagepicker_advanced_iframe_width', "100%") .'; height: '. variable_get('imagepicker_advanced_iframe_height', 500) .'px; border: '. variable_get('imagepicker_advanced_iframe_border', "0") .';" src="'. url('imagepicker') .'">Imagepicker requires iframe support.</iframe></div>',
+        '#value' => '<div id="imgp_tb">'. $iurl .'</div>',
       );
       $form['body_field']['#prefix'] = '<a name="body_hash"></a>'. $form['body_field']['#prefix'];
     }
@@ -295,10 +303,9 @@
       );
       $form['block_settings']['file_upload']['mpframe'] = array(
         '#type' => 'markup',
-        '#value' => '<div><iframe id="imagepicker" style="width: '. variable_get('imagepicker_advanced_iframe_width', "100%") .'; height: '. variable_get('imagepicker_advanced_iframe_height', 500) .'px; border: '. variable_get('imagepicker_advanced_iframe_border', "0") .';" src="'. url('imagepicker') .'">Imagepicker requires iframe support.</iframe></div>',
+        '#value' => '<div id="imgp_tb">'. $iurl .'</div>',
       );
       $form['block_settings']['#prefix'] = '<a name="body_hash"></a>'. $form['block_settings']['#prefix'];
-
     }
   }
 }
@@ -386,6 +393,9 @@
   if (module_exists('lightbox2') && variable_get('imagepicker_lightbox2_enable', 1) ) {
     $linkoptions['lightbox'] = t('Lightbox');
   }
+  if (module_exists('thickbox') && variable_get('imagepicker_thickbox_enable', 1) ) {
+    $linkoptions['thickbox'] = t('Thickbox');
+  }
   if (variable_get('imagepicker_default_align_show', 1)) {
     $alignoptions = array('none' => t('None'), 'fleft' => t('Float Left'), 'fright' => t('Float right'));
     $form['align'] = array(
@@ -738,6 +748,12 @@
         case 'lightbox': imgpLinkElement = '<a href=\"'+imgpFileLink+'\" title=\"'+imgpImageTitle+'\" rel=\"". variable_get('imagepicker_lightbox2_insert', 'lightbox') ."\" >%imgpImageElement%<\/a>'; break;
 ";
   }
+  if (module_exists('thickbox') && variable_get('imagepicker_thickbox_enable', 1)) {
+  $ret .= "
+        case 'thickbox': imgpLinkElement = '<a href=\"'+imgpFileLink+'\" title=\"'+imgpImageTitle+'\" class=\"thickbox\" >%imgpImageElement%<\/a>'; break;
+";
+  }
+
   $ret .= "
         default: imgpLinkElement = '<a href=\"'+imgpFileLink+'\" title=\"'+imgpImageTitle+'\" target=\"_blank\" >%imgpImageElement%<\/a>'; break;
       }