--- node_gallery.pages.inc	Sun Apr 11 05:51:33 2010
+++ node_gallery.pages.inc	Sun Apr 11 03:51:50 2010
@@ -332,6 +332,11 @@
       $file->type = empty($file->type) ? $gallery->config['image_type'] : $file->type;
       $file->gid = empty($file->gid) ? $gallery->nid : $file->gid;
       $form['files'][$key]['edit_form'] = node_gallery_image_item_edit_form($form_state['values']['files'][$key]['edit_form'], $file, $gallery->config);
+      //ufo - optionwidgets needs fieldinfo
+      if (!isset($form['#field_info'])){
+        $field_info=$form['files'][$key]['edit_form']['#field_info'];
+        $form['#field_info']=$field_info;
+      };
     }
   }
   
@@ -440,6 +445,10 @@
   $display_fields = $config['display_fields'];
   $form = drupal_retrieve_form($image->type .'_node_form', $form_state, $image);
   drupal_prepare_form($image->type ."_node_form", $form, $form_state);
+  $item_form=array();
+  //ufo
+  $display_fields['#field_info']='#field_info'; //this should be merged with parent form to optionwidget to work
+  //$display_fields['#type']='#type';
   foreach (array_values($display_fields) as $field_name) {
     if (!empty($field_name)) {
       //$item_form[$field_name] = (array)get_image_form_item_recursive($form, $field_name);
@@ -448,7 +457,6 @@
   }
   $item_form += (array)get_image_form_value_items($form);
   set_image_form_default_values($item_form, $image, $config);
-  
   return $item_form;
 }