Misses this file to merge. I like the comments.

[quix0rs-gnu-social.git] / lib / activityobject.php

diff --git a/lib/activityobject.php b/lib/activityobject.php
index aa7636c713bc37ebdd7214505ef97439127dadf3..2fe52eefcc5a84f883757f9aba8818446d1a657b 100644 (file)
--- a/lib/activityobject.php
+++ b/lib/activityobject.php
@@ -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;
                     }