Avoid link parsing problems in front of "share" elements

[friendica.git] / mod / display.php

diff --git a/mod/display.php b/mod/display.php
index a2bf21867e6c82a9b98b0bce285c8666cb40de3e..62e180874d1c60b6d61f19cd7516fda6688a719e 100644 (file)
--- a/mod/display.php
+++ b/mod/display.php
@@ -24,7 +24,6 @@ use Friendica\Content\Text\BBCode;
 use Friendica\Content\Widget;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
-use Friendica\Core\Session;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -70,10 +69,10 @@ function display_init(App $a)
                }
 
                // Is this item private but could be visible to the remove visitor?
-               if (!DBA::isResult($item) && DI::userSession()->getRemoteUserId) {
+               if (!DBA::isResult($item) && DI::userSession()->getRemoteUserId()) {
                        $item = Post::selectFirst($fields, ['guid' => DI::args()->getArgv()[1], 'private' => Item::PRIVATE, 'origin' => true]);
                        if (DBA::isResult($item)) {
-                               if (!Contact::isFollower(DI::userSession()->getRemoteUserId, $item['uid'])) {
+                               if (!Contact::isFollower(DI::userSession()->getRemoteUserId(), $item['uid'])) {
                                        $item = null;
                                } else {
                                        $item_user = $item['uid'];
@@ -123,11 +122,9 @@ function display_init(App $a)
 
 function display_fetchauthor($item)
 {
-       if (Diaspora::isReshare($item['body'], true)) {
-               $shared = Item::getShareArray($item);
-               if (!empty($shared['profile'])) {
-                       $contact = Contact::getByURLForUser($shared['profile'], DI::userSession()->getLocalUserId());
-               }
+       $shared = DI::contentItem()->getSharedPost($item, ['author-link']);
+       if (!empty($shared) && empty($shared['comment'])) {
+               $contact = Contact::getByURLForUser($shared['post']['author-link'], DI::userSession()->getLocalUserId());
        }
 
        if (empty($contact)) {
@@ -190,9 +187,9 @@ function display_content(App $a, $update = false, $update_uid = 0)
                                }
                        }
 
-                       if (($parent_uri_id == 0) && DI::userSession()->getRemoteUserId) {
+                       if (($parent_uri_id == 0) && DI::userSession()->getRemoteUserId()) {
                                $item = Post::selectFirst($fields, ['guid' => DI::args()->getArgv()[1], 'private' => Item::PRIVATE, 'origin' => true]);
-                               if (DBA::isResult($item) && Contact::isFollower(DI::userSession()->getRemoteUserId, $item['uid'])) {
+                               if (DBA::isResult($item) && Contact::isFollower(DI::userSession()->getRemoteUserId(), $item['uid'])) {
                                        $uri_id = $item['uri-id'];
                                        $parent_uri_id = $item['parent-uri-id'];
                                }