# HG changeset patch
# User david <david@davidseth.net>
# Date 1267533427 -36000
# Node ID f12158a082cb463bcbcd751f0a64847a54de123c
# Parent  7dbba813ba26d7e67e8963494f1ef1d134aebf72
fixing bugs in vimeo module

diff -r 7dbba813ba26 -r f12158a082cb htdocs/sites/all/modules/vimeo/vimeo.module
--- a/htdocs/sites/all/modules/vimeo/vimeo.module	Tue Mar 02 17:04:31 2010 +1000
+++ b/htdocs/sites/all/modules/vimeo/vimeo.module	Tue Mar 02 22:37:07 2010 +1000
@@ -489,9 +489,9 @@
   $data = $data[0];
   
   //Download large thumbnail to our server (for use with ImageCache)
-  do {
+  //do {
     $result = vimeo_download_thumbnail($vid, $data['thumbnail_large']);
-  } while ($result != TRUE);
+  //} while ($result != TRUE);
   
   //Add local thumbnail to data array
   $data['thumbnail_local'] = file_create_path() . '/vimeo-originals/' . $vid . '.jpg';
@@ -866,14 +866,26 @@
  * Theme function for 'default' vimeo field formatter.
  */
 function theme_vimeo_formatter_default($element) {
-  $data = vimeo_cache_video_get($element['#item']['value']);
-  
-  return '<object width="'. variable_get('vimeo_width', 640) .'" height="'. variable_get('vimeo_height', 360) .'" class="vimeo-video">
-    <param name="allowfullscreen" value="true" />
-    <param name="allowscriptaccess" value="always" />
-    <param name="movie" value="http://vimeo.com/moogaloop.swf?clip_id='.$data['id'].'&amp;server=vimeo.com&amp;show_title='. variable_get('vimeo_title', 1) .'&amp;show_byline='. variable_get('vimeo_byline', 1) .'&amp;show_portrait='. variable_get('vimeo_portrait', 1) .'&amp;color='. variable_get('vimeo_colour', '00ADEF') .'&amp;fullscreen='. variable_get('vimeo_fullscreen', 1) .'&amp;autoplay='. variable_get('vimeo_autoplay', 0) .'" />
-    <embed src="http://vimeo.com/moogaloop.swf?clip_id='.$data['id'].'&amp;server=vimeo.com&amp;show_title='. variable_get('vimeo_title', 1) .'&amp;show_byline='. variable_get('vimeo_byline', 1) .'&amp;show_portrait='. variable_get('vimeo_portrait', 1) .'&amp;color='. variable_get('vimeo_colour', '00ADEF') .'&amp;fullscreen='. variable_get('vimeo_fullscreen', 1) .'&amp;autoplay='. variable_get('vimeo_autoplay', 0) .'" type="application/x-shockwave-flash" allowfullscreen="true" allowscriptaccess="always" width="'. variable_get('vimeo_width', 640) .'" height="'. variable_get('vimeo_height', 360) .'"></embed>
-  </object>';
+  //$video_vid = 0;
+
+  if (isset($element['#item']['value']) && !empty ($element['#item']['value']) ) {
+    $video_vid = $element['#item']['value'];
+  }
+
+  if ($video_vid > 0) {
+
+    $data = vimeo_cache_video_get($element['#item']['value']);
+
+    return '<object width="'. variable_get('vimeo_width', 640) .'" height="'. variable_get('vimeo_height', 360) .'" class="vimeo-video">
+      <param name="allowfullscreen" value="true" />
+      <param name="allowscriptaccess" value="always" />
+      <param name="movie" value="http://vimeo.com/moogaloop.swf?clip_id='.$data['id'].'&amp;server=vimeo.com&amp;show_title='. variable_get('vimeo_title', 1) .'&amp;show_byline='. variable_get('vimeo_byline', 1) .'&amp;show_portrait='. variable_get('vimeo_portrait', 1) .'&amp;color='. variable_get('vimeo_colour', '00ADEF') .'&amp;fullscreen='. variable_get('vimeo_fullscreen', 1) .'&amp;autoplay='. variable_get('vimeo_autoplay', 0) .'" />
+      <embed src="http://vimeo.com/moogaloop.swf?clip_id='.$data['id'].'&amp;server=vimeo.com&amp;show_title='. variable_get('vimeo_title', 1) .'&amp;show_byline='. variable_get('vimeo_byline', 1) .'&amp;show_portrait='. variable_get('vimeo_portrait', 1) .'&amp;color='. variable_get('vimeo_colour', '00ADEF') .'&amp;fullscreen='. variable_get('vimeo_fullscreen', 1) .'&amp;autoplay='. variable_get('vimeo_autoplay', 0) .'" type="application/x-shockwave-flash" allowfullscreen="true" allowscriptaccess="always" width="'. variable_get('vimeo_width', 640) .'" height="'. variable_get('vimeo_height', 360) .'"></embed>
+    </object>';
+  }
+  else {
+    return "";
+  }
 }
 
 /**