aboutsummaryrefslogtreecommitdiff
path: root/video.field.inc
diff options
context:
space:
mode:
authorSilvio <silvio@devlet.com.br>2011-07-12 10:26:40 -0300
committerSilvio <silvio@devlet.com.br>2011-07-12 10:26:40 -0300
commit84a089eb09ab21d5062faa3b4021f95da930caaf (patch)
tree04e6efe1d61c0dce3f5c526ab184e89588d7a878 /video.field.inc
parentd598b738b366190db350b95cebb1e1cf0e1c54c6 (diff)
parentb2eb0df792e7724538c4afeb7d8929a241a03773 (diff)
downloadvideo-84a089eb09ab21d5062faa3b4021f95da930caaf.tar.gz
video-84a089eb09ab21d5062faa3b4021f95da930caaf.tar.bz2
Merge branch '7.x-1.x' of http://git.drupal.org/project/video into 7.x-1.x
Conflicts: transcoders/video_ffmpeg_php.inc
Diffstat (limited to 'video.field.inc')
-rw-r--r--video.field.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/video.field.inc b/video.field.inc
index 72b15e5..c848b5e 100644
--- a/video.field.inc
+++ b/video.field.inc
@@ -135,7 +135,7 @@ function video_field_presave($entity_type, $entity, $field, $instance, $langcode
if (!empty($field['settings']['default_video_thumbnail'])) {
foreach ($items as $delta => $item) {
if ($item['use_default_video_thumb'])
- $items[$delta]['thumbanail'] = $field['settings']['default_video_thumbnail']['fid'];
+ $items[$delta]['thumbnail'] = $field['settings']['default_video_thumbnail']['fid'];
}
}
file_field_presave($entity_type, $entity, $field, $instance, $langcode, $items);