eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Use getUrl() instead of ->url in OembedAction

Browse Source
This commit is contained in:
Mikael Nordfeldth 2014-04-19 22:05:44 +02:00
parent 2c1dcc7f14
commit 454a9bc1c4
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
actions/oembed.php
View File

@ -91,7 +91,7 @@ class OembedAction extends Action
common_exact_date($notice->created)); common_exact_date($notice->created));
$oembed['author_name']=$authorname; $oembed['author_name']=$authorname;
$oembed['author_url']=$profile->profileurl; $oembed['author_url']=$profile->profileurl;
$oembed['url']=($notice->url?$notice->url:$notice->uri); $oembed['url']=$notice->getUrl();
$oembed['html']=$notice->rendered; $oembed['html']=$notice->rendered;
break; break;
case 'attachment': case 'attachment':
@ -113,7 +113,7 @@ class OembedAction extends Action
$oembed['title']=$file_oembed->title; $oembed['title']=$file_oembed->title;
$oembed['author_name']=$file_oembed->author_name; $oembed['author_name']=$file_oembed->author_name;
$oembed['author_url']=$file_oembed->author_url; $oembed['author_url']=$file_oembed->author_url;
$oembed['url']=$file_oembed->url; $oembed['url']=$file_oembed->getUrl();
}else if(substr($attachment->mimetype,0,strlen('image/'))=='image/'){ }else if(substr($attachment->mimetype,0,strlen('image/'))=='image/'){
$oembed['type']='photo'; $oembed['type']='photo';
if ($attachment->filename) { if ($attachment->filename) {
@ -126,10 +126,10 @@ class OembedAction extends Action
// TODO Either throw an error or find a fallback? // TODO Either throw an error or find a fallback?
} }
} }
$oembed['url']=$attachment->url; $oembed['url']=$attachment->getUrl();
$thumb = $attachment->getThumbnail(); $thumb = $attachment->getThumbnail();
if ($thumb) { if ($thumb) {
$oembed['thumbnail_url'] = $thumb->url; $oembed['thumbnail_url'] = $thumb->getUrl();
$oembed['thumbnail_width'] = $thumb->width; $oembed['thumbnail_width'] = $thumb->width;
$oembed['thumbnail_height'] = $thumb->height; $oembed['thumbnail_height'] = $thumb->height;
} }

5
classes/File_oembed.php
View File

@ -89,6 +89,11 @@ class File_oembed extends Managed_DataObject
} }
} }
public function getUrl()
{
return $this->url;
}
/** /**
* Save embedding info for a new file. * Save embedding info for a new file.
* *