Merge pull request #5830 from nupplaphil/update_from_boot

[friendica.git] / mod / display.php

diff --git a/mod/display.php b/mod/display.php
index 25bda99d013881eeacd20ecf08a1f4e3ddefa3f4..d95404a5b135ead15ce714a898b5b19525ba3599 100644 (file)
--- a/mod/display.php
+++ b/mod/display.php
@@ -4,11 +4,13 @@
  */
 
 use Friendica\App;
+use Friendica\Content\Pager;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
 use Friendica\Core\ACL;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
@@ -16,8 +18,8 @@ use Friendica\Model\Contact;
 use Friendica\Model\Group;
 use Friendica\Model\Item;
 use Friendica\Model\Profile;
-use Friendica\Protocol\DFRN;
 use Friendica\Protocol\ActivityPub;
+use Friendica\Protocol\DFRN;
 
 function display_init(App $a)
 {
@@ -73,12 +75,12 @@ function display_init(App $a)
        }
 
        if (!empty($_SERVER['HTTP_ACCEPT']) && strstr($_SERVER['HTTP_ACCEPT'], 'application/atom+xml')) {
-               logger('Directly serving XML for id '.$item["id"], LOGGER_DEBUG);
+               Logger::log('Directly serving XML for id '.$item["id"], Logger::DEBUG);
                displayShowFeed($item["id"], false);
        }
 
        if (ActivityPub::isRequest()) {
-               goaway(str_replace('display/', 'object/', $a->query_string));
+               $a->internalRedirect(str_replace('display/', 'objects/', $a->query_string));
        }
 
        if ($item["id"] != $item["parent"]) {
@@ -200,7 +202,6 @@ function display_content(App $a, $update = false, $update_uid = 0)
                return;
        }
 
-       require_once 'include/security.php';
        require_once 'include/conversation.php';
 
        $o = '';
@@ -325,7 +326,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
                $o .= status_editor($a, $x, 0, true);
        }
 
-       $sql_extra = item_permissions_sql($a->profile['uid'], $is_remote_contact, $groups);
+       $sql_extra = Item::getPermissionsSQLByUserId($a->profile['uid'], $is_remote_contact, $groups);
 
        if (local_user() && (local_user() == $a->profile['uid'])) {
                $condition = ['parent-uri' => $item_parent_uri, 'uid' => local_user(), 'unseen' => true];
@@ -358,14 +359,14 @@ function display_content(App $a, $update = false, $update_uid = 0)
                $o .= "<script> var netargs = '?f=&item_id=" . $item_id . "'; </script>";
        }
 
-       $o .= conversation($a, [$item], 'display', $update_uid, false, 'commented', local_user());
+       $o .= conversation($a, [$item], new Pager($a->query_string), 'display', $update_uid, false, 'commented', local_user());
 
        // Preparing the meta header
        $description = trim(HTML::toPlaintext(BBCode::convert($item["body"], false), 0, true));
        $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;