summaryrefslogtreecommitdiff
path: root/actions/oembed.php
diff options
context:
space:
mode:
Diffstat (limited to 'actions/oembed.php')
-rw-r--r--actions/oembed.php19
1 files changed, 16 insertions, 3 deletions
diff --git a/actions/oembed.php b/actions/oembed.php
index da3aa0c71..09d68a446 100644
--- a/actions/oembed.php
+++ b/actions/oembed.php
@@ -108,10 +108,23 @@ class OembedAction extends Action
$oembed['url']=$file_oembed->url;
}else if(substr($attachment->mimetype,0,strlen('image/'))=='image/'){
$oembed['type']='photo';
- //TODO set width and height
- //$oembed['width']=
- //$oembed['height']=
+ if ($attachment->filename) {
+ $filepath = File::path($attachment->filename);
+ $gis = @getimagesize($filepath);
+ if ($gis) {
+ $oembed['width'] = $gis[0];
+ $oembed['height'] = $gis[1];
+ } else {
+ // TODO Either throw an error or find a fallback?
+ }
+ }
$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',