Merge pull request #5862 from nupplaphil/rename_App_Methods

[friendica.git] / mod / display.php

diff --git a/mod/display.php b/mod/display.php
index 1b4508c18d96982251d01e9f4c939edcc3052bbe..a03b918372efd61636961fbbf488f486aec18ddc 100644 (file)
--- a/mod/display.php
+++ b/mod/display.php
@@ -78,13 +78,9 @@ function display_init(App $a)
        }
 
        if (ActivityPub::isRequest()) {
-               $wall_item = Item::selectFirst(['id', 'uid'], ['guid' => $item['guid'], 'wall' => true]);
-               if ($wall_item['uid'] == 180) {
-                       $data = ActivityPub::createObjectFromItemID($wall_item['id']);
-                       echo json_encode($data);
-                       exit();
-               }
+               goaway(str_replace('display/', 'objects/', $a->query_string));
        }
+
        if ($item["id"] != $item["parent"]) {
                $item = Item::selectFirstForUser(local_user(), $fields, ['id' => $item["parent"]]);
        }
@@ -369,7 +365,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
        $title = trim(HTML::toPlaintext(BBCode::convert($item["title"], false), 0, true));
        $author_name = $item["author-name"];
 
-       $image = $a->remove_baseurl($item["author-avatar"]);
+       $image = $a->removeBaseURL($item["author-avatar"]);
 
        if ($title == "") {
                $title = $author_name;