summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrion Vibber <brion@status.net>2010-11-08 17:22:01 -0800
committerBrion Vibber <brion@status.net>2010-11-08 17:22:01 -0800
commit6d7f02ff31c6c929223030b051541b1bf103f3a8 (patch)
tree1c265f68c64505dc566f9e459a17984a408c9f1f
parentc36fecb79431218016615cde45215337d67fee67 (diff)
Pass file attachment thumbnails along with oEmbed data.
-rw-r--r--actions/oembed.php6
-rw-r--r--classes/File.php10
2 files changed, 16 insertions, 0 deletions
diff --git a/actions/oembed.php b/actions/oembed.php
index da3aa0c71..11d814583 100644
--- a/actions/oembed.php
+++ b/actions/oembed.php
@@ -112,6 +112,12 @@ class OembedAction extends Action
//$oembed['width']=
//$oembed['height']=
$oembed['url']=$attachment->url;
+ $thumb = $attachment->getThumbnail();
+ if ($thumb) {
+ $oembed['thumbnail_url'] = $thumb->url;
+ $oembed['thumbnail_width'] = $thumb->width;
+ $oembed['thumbnail_height'] = $thumb->height;
+ }
}else{
$oembed['type']='link';
$oembed['url']=common_local_url('attachment',
diff --git a/classes/File.php b/classes/File.php
index e3b922d13..56bc73ab2 100644
--- a/classes/File.php
+++ b/classes/File.php
@@ -384,4 +384,14 @@ class File extends Memcached_DataObject
$enclosure = $this->getEnclosure();
return !empty($enclosure);
}
+
+ /**
+ * Get the attachment's thumbnail record, if any.
+ *
+ * @return File_thumbnail
+ */
+ function getThumbnail()
+ {
+ return File_thumbnail::staticGet('file_id', $this->id);
+ }
}