Merge remote-tracking branch 'upstream/master'

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

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