From: Michael <heluecht@pirati.ca>
Date: Tue, 3 Mar 2020 22:22:59 +0000 (+0000)
Subject: Restore previous state
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=986877b1cf229537cc1f5f44f77afa4646fa3917;p=friendica.git

Restore previous state
---

diff --git a/src/Protocol/ActivityPub.php b/src/Protocol/ActivityPub.php
index fd2f84e515..f1cd652f47 100644
--- a/src/Protocol/ActivityPub.php
+++ b/src/Protocol/ActivityPub.php
@@ -209,7 +209,7 @@ class ActivityPub
 
 		foreach ($items as $activity) {
 			$ldactivity = JsonLD::compact($activity);
-			ActivityPub\Receiver::processActivity($ldactivity, json_encode($activity), $uid, true);
+			ActivityPub\Receiver::processActivity($ldactivity, '', $uid, true);
 		}
 	}
 
diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index 2f4c784537..14b993e6e2 100644
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -687,7 +687,7 @@ class Processor
 
 		$ldactivity['thread-completion'] = true;
 
-		ActivityPub\Receiver::processActivity($ldactivity, json_encode($activity));
+		ActivityPub\Receiver::processActivity($ldactivity);
 		Logger::notice('Activity had been fetched and processed.', ['url' => $url, 'object' => $activity['id']]);
 
 		return $activity['id'];
diff --git a/src/Protocol/ActivityPub/Receiver.php b/src/Protocol/ActivityPub/Receiver.php
index 67404af5e5..97eb3b62c6 100644
--- a/src/Protocol/ActivityPub/Receiver.php
+++ b/src/Protocol/ActivityPub/Receiver.php
@@ -784,11 +784,7 @@ class Receiver
 		}
 
 		if (in_array($type, self::CONTENT_TYPES)) {
-			$object_data = self::processObject($object);
-			if (!empty($data)) {
-				$object_data['raw'] = json_encode($data);
-			}
-			return $object_data;
+			return self::processObject($object);
 		}
 
 		if ($type == 'as:Announce') {