Pass file attachment thumbnails along with oEmbed data.

diff --git a/actions/oembed.php b/actions/oembed.php
index da3aa0c716c8d313881cc5bc1ec8c1e22a6b1c8a..11d814583701a78a23392042b8dd861618e8f532 100644 (file)
--- 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 e3b922d13b8efc000971f68a0714e5f260783385..56bc73ab257d4d40948f4cc1dcfb7e5e826250c2 100644 (file)
--- 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);
+    }
 }