From 9d8eca2287b7c256d7c879a81f4e28982b93f117 Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 29 Nov 2018 22:42:10 +0000 Subject: [PATCH] Using the same function for display and objects --- mod/display.php | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/mod/display.php b/mod/display.php index 1bb2a6ec81..fc3ab7db0e 100644 --- a/mod/display.php +++ b/mod/display.php @@ -22,6 +22,7 @@ use Friendica\Model\Profile; use Friendica\Protocol\ActivityPub; use Friendica\Protocol\DFRN; use Friendica\Util\Strings; +use Friendica\Module\Objects; function display_init(App $a) { @@ -82,16 +83,7 @@ function display_init(App $a) } if (ActivityPub::isRequest()) { - $item = Item::selectFirst(['id'], ['guid' => $a->argv[1], 'origin' => true, 'private' => false]); - if (!DBA::isResult($item)) { - System::httpExit(404); - } - - $data = ActivityPub\Transmitter::createObjectFromItemID($item['id']); - - header('Content-Type: application/activity+json'); - echo json_encode($data); - exit(); + Objects::rawContent(); } if ($item["id"] != $item["parent"]) {