Reenable Twitter/Favorites tests

[friendica.git] / mod / display.php

diff --git a/mod/display.php b/mod/display.php
index a349a552c30c088a12074ce1f0bd0dc27764424e..50f405495600c531e9f6fbca5719502406167981 100644 (file)
--- a/mod/display.php
+++ b/mod/display.php
@@ -40,7 +40,7 @@ use Friendica\Protocol\DFRN;
 function display_init(App $a)
 {
        if (ActivityPub::isRequest()) {
-               Objects::rawContent(['guid' => DI::args()->getArgv()[1] ?? null]);
+               (new Objects(DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), $_SERVER, ['guid' => DI::args()->getArgv()[1] ?? null]))->run();
        }
 
        if (DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) {
@@ -99,7 +99,7 @@ function display_init(App $a)
        }
 
        if (!empty($_SERVER['HTTP_ACCEPT']) && strstr($_SERVER['HTTP_ACCEPT'], 'application/atom+xml')) {
-               Logger::log('Directly serving XML for uri-id '.$item['uri-id'], Logger::DEBUG);
+               Logger::info('Directly serving XML for uri-id '.$item['uri-id']);
                displayShowFeed($item['uri-id'], $item['uid'], false);
        }
 
@@ -121,7 +121,7 @@ function display_fetchauthor($item)
        $shared = Item::getShareArray($item);
        if (!empty($shared) && empty($shared['comment'])) {
                $profiledata = [
-                       'uid' => -1,
+                       'uid' => 0,
                        'id' => -1,
                        'nickname' => '',
                        'name' => '',
@@ -144,7 +144,7 @@ function display_fetchauthor($item)
                }
 
                $profiledata['nickname'] = $profiledata['name'];
-               $profiledata['network'] = Protocol::matchByProfileUrl($profiledata['url']);
+               $profiledata['network'] = Protocol::PHANTOM;
 
                $profiledata['address'] = '';
                $profiledata['about'] = '';
@@ -173,7 +173,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
 
        if ($update) {
                $uri_id = $_REQUEST['uri_id'];
-               $item = Post::selectFirst(['uid', 'parent-uri-id'], ['uri-id' => $uri_id, 'uid' => [0, $update_uid]]);
+               $item = Post::selectFirst(['uid', 'parent-uri-id'], ['uri-id' => $uri_id, 'uid' => [0, $update_uid]], ['order' => ['uid' => true]]);
                if (!empty($item)) {
                        if ($item['uid'] != 0) {
                                $a->setProfileOwner($item['uid']);
@@ -190,8 +190,8 @@ function display_content(App $a, $update = false, $update_uid = 0)
                        $fields = ['uri-id', 'parent-uri-id', 'uid'];
 
                        if (local_user()) {
-                               $condition = ['guid' => DI::args()->getArgv()[1], 'uid' => local_user()];
-                               $item = Post::selectFirstForUser(local_user(), $fields, $condition);
+                               $condition = ['guid' => DI::args()->getArgv()[1], 'uid' => [0, local_user()]];
+                               $item = Post::selectFirstForUser(local_user(), $fields, $condition, ['order' => ['uid' => true]]);
                                if (DBA::isResult($item)) {
                                        $uri_id = $item['uri-id'];
                                        $parent_uri_id = $item['parent-uri-id'];