diff -rupN video_upload/video_upload.theme.inc video_upload_new/video_upload.theme.inc --- video_upload/video_upload.theme.inc 2009-09-05 06:51:16.000000000 +1000 +++ video_upload.theme.inc 2009-10-29 12:48:36.000000000 +1100 @@ -9,8 +9,24 @@ /** * Theme a video + * + * @param $item + * The video item array + * @param $width + * The width of the video player in pixels + * @param $height + * The height of the video player in pixels + * @param $field + * The cck field definition + * @param $params + * The parameters for the video player + * @param $attributes + * The attributes for the video player + * + * @ingroup themeable */ -function theme_video_upload_video($yt_id, $width = '480', $height = '295', $field = array(), $params = array(), $attributes = array()) { +function theme_video_upload_video($item, $width = '480', $height = '295', $field = array(), $params = array(), $attributes = array()) { + $yt_id = $item['video_id']; if (!$yt_id) { // Output the video image instead. $attributes = array( @@ -296,7 +312,7 @@ function theme_video_upload_formatter_de if (!$item['video_id']) { drupal_set_message(theme('video_upload_status_text', $item['video_status'])); } - return theme('video_upload_video', $item['video_id'], $display['default_width'], $display['default_height'], $field); + return theme('video_upload_video', $item, $display['default_width'], $display['default_height'], $field); } function theme_video_upload_formatter_small($element) { @@ -307,7 +323,7 @@ function theme_video_upload_formatter_sm return; } - return theme('video_upload_video', $item['video_id'], $display['small_width'], $display['small_height'], $field); + return theme('video_upload_video', $item, $display['small_width'], $display['small_height'], $field); } function theme_video_upload_formatter_thumb($element) { diff -rupN video_upload/video_upload_widget.inc video_upload_new/video_upload_widget.inc --- video_upload/video_upload_widget.inc 2009-09-05 06:51:16.000000000 +1000 +++ video_upload_widget.inc 2009-10-29 12:37:37.000000000 +1100 @@ -375,7 +375,7 @@ function theme_video_upload_widget(&$ele function theme_video_upload_widget_preview($item = NULL) { $message = theme('video_upload_status_text', $item['video_status']); - return '
' . $message . '
' . theme('video_upload_video', $items['id']); + return '
' . $message . '
' . theme('video_upload_video', $item); } /**