GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Use getUrl() on File and File_thumbnail instead of ->url

Browse Source
This commit is contained in:
Mikael Nordfeldth
2015-03-04 13:13:04 +01:00
parent a4af51b5ba
commit 286b54e527
4 changed files with 20 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/activityobject.php
View File

@@ -512,11 +512,11 @@ class ActivityObject
switch (self::canonicalType($object->type)) {
case 'image':
$object->largerImage = $file->url;
$object->largerImage = $file->getUrl();
break;
case 'video':
case 'audio':
$object->stream = $file->url;
$object->stream = $file->getUrl();
break;
}
@@ -861,7 +861,7 @@ class ActivityObject
if (is_string($this->thumbnail)) {
$object['image'] = array('url' => $this->thumbnail);
} else {
$object['image'] = array('url' => $this->thumbnail->url);
$object['image'] = array('url' => $this->thumbnail->getUrl());
if ($this->thumbnail->width) {
$object['image']['width'] = $this->thumbnail->width;
}