Index: contrib/emthumb/emthumb.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/emfield/contrib/emthumb/emthumb.module,v
retrieving revision 1.7.2.17
diff -u -r1.7.2.17 emthumb.module
--- contrib/emthumb/emthumb.module	22 Apr 2009 15:48:48 -0000	1.7.2.17
+++ contrib/emthumb/emthumb.module	8 May 2009 16:18:52 -0000
@@ -59,7 +59,8 @@
         unset($items[0]['emthumb']['emthumb']['emthumb']['emthumb']);
       }
       foreach ($items as  $delta => $item) {
-        $items[$delta]['data']['emthumb'] = _emthumb_file_insert($node, $item['data']['emthumb'], $field);
+        $file = $item['data']['emthumb'];
+        $items[$delta]['data']['emthumb'] = _emthumb_file_insert($node, $file, $field);
       }
       break;
 
Index: contrib/emvideo/emvideo.theme.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/emfield/contrib/emvideo/Attic/emvideo.theme.inc,v
retrieving revision 1.1.2.19
diff -u -r1.1.2.19 emvideo.theme.inc
--- contrib/emvideo/emvideo.theme.inc	5 Mar 2009 16:45:36 -0000	1.1.2.19
+++ contrib/emvideo/emvideo.theme.inc	8 May 2009 16:18:52 -0000
@@ -147,9 +147,9 @@
 function theme_emvideo_video_preview($field, $item, $formatter, $node, $options = array()) {
   if ($item['value'] && $item['provider']) {
     $embed = $item['value'];
-    $width = $options['width'] ? $options['width'] : ($field['widget']['preview_width'] ? $field['widget']['preview_width'] : variable_get('emvideo_default_preview_width', EMVIDEO_DEFAULT_PREVIEW_WIDTH));
-    $height = $options['height'] ? $options['height'] : ($field['widget']['preview_height'] ? $field['widget']['preview_height'] : variable_get('emvideo_default_preview_height', EMVIDEO_DEFAULT_PREVIEW_HEIGHT));
-    $autoplay = $options['autoplay'] ? $options['autoplay'] : $field['widget']['preview_autoplay'];
+    $width = isset($options['width']) ? $options['width'] : (isset($field['widget']['preview_width']) ? $field['widget']['preview_width'] : variable_get('emvideo_default_preview_width', EMVIDEO_DEFAULT_PREVIEW_WIDTH));
+    $height = isset($options['height']) ? $options['height'] : (isset($field['widget']['preview_height']) ? $field['widget']['preview_height'] : variable_get('emvideo_default_preview_height', EMVIDEO_DEFAULT_PREVIEW_HEIGHT));
+    $autoplay = isset($options['autoplay']) ? $options['autoplay'] : (isset($field['widget']['preview_autoplay']) ? $field['widget']['preview_autoplay'] : FALSE);
     $output = module_invoke('emfield', 'include_invoke', 'emvideo', $item['provider'], 'preview', $embed, $width, $height, $field, $item, $node, $autoplay, $options);
   }