X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Factivityobject.php;h=87eea13727e3261c8829a8459dad19b42113caab;hb=73dbc5ca1b203758693f73d6423fea71ef6b6fb6;hp=9a6218de3af9e954a97d7cd92a0e509c2f88fd24;hpb=d3a8896b2a10ca74fb265c603d50d175b49b50b4;p=quix0rs-gnu-social.git

diff --git a/lib/activityobject.php b/lib/activityobject.php
index 9a6218de3a..87eea13727 100644
--- a/lib/activityobject.php
+++ b/lib/activityobject.php
@@ -274,6 +274,10 @@ class ActivityObject
     // @todo FIXME: rationalize with Activity::_fromRssItem()
     private function _fromRssItem($item)
     {
+        if (empty($this->type)) {
+            $this->type = ActivityObject::NOTE;
+        }
+
         $this->title = ActivityUtils::childContent($item, ActivityObject::TITLE, Activity::RSS);
 
         $contentEl = ActivityUtils::child($item, ActivityUtils::CONTENT, Activity::CONTENTNS);
@@ -294,7 +298,7 @@ class ActivityObject
         if (!empty($guidEl)) {
             $this->id = $guidEl->textContent;
 
-            if ($guidEl->hasAttribute('isPermaLink')) {
+            if ($guidEl->hasAttribute('isPermaLink') && $guidEl->getAttribute('isPermaLink') != 'false') {
                 // overwrites <link>
                 $this->link = $this->id;
             }
@@ -508,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;
             }
 
@@ -857,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;
                     }