Merge pull request #7924 from annando/issue-7691

[friendica.git] / mod / display.php

diff --git a/mod/display.php b/mod/display.php
index 8513788dfca9eb9244434b67b1d13bd3868a323e..ba339b918519cea5018db041f628e0934fecb56a 100644 (file)
--- a/mod/display.php
+++ b/mod/display.php
@@ -133,51 +133,20 @@ function display_fetchauthor($a, $item)
        $profiledata['network'] = $author['network'];
 
        // Check for a repeated message
-       $skip = false;
-       $body = trim($item["body"]);
-
-       // Skip if it isn't a pure repeated messages
-       // Does it start with a share?
-       if (!$skip && strpos($body, "[share") > 0) {
-               $skip = true;
-       }
-       // Does it end with a share?
-       if (!$skip && (strlen($body) > (strrpos($body, "[/share]") + 8))) {
-               $skip = true;
-       }
-       if (!$skip) {
-               $attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","$1",$body);
-               // Skip if there is no shared message in there
-               if ($body == $attributes) {
-                       $skip = true;
+       $shared = Item::getShareArray($item);
+       if (!empty($shared) && empty($shared['comment'])) {
+               if (!empty($shared['author'])) {
+                       $profiledata['name'] = $shared['author'];
                }
-       }
 
-       if (!$skip) {
-               preg_match("/author='(.*?)'/ism", $attributes, $matches);
-               if (!empty($matches[1])) {
-                       $profiledata["name"] = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8');
-               }
-               preg_match('/author="(.*?)"/ism', $attributes, $matches);
-               if (!empty($matches[1])) {
-                       $profiledata["name"] = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8');
+               if (!empty($shared['profile'])) {
+                       $profiledata['url'] = $shared['profile'];
                }
-               preg_match("/profile='(.*?)'/ism", $attributes, $matches);
-               if (!empty($matches[1])) {
-                       $profiledata["url"] = $matches[1];
-               }
-               preg_match('/profile="(.*?)"/ism', $attributes, $matches);
-               if (!empty($matches[1])) {
-                       $profiledata["url"] = $matches[1];
-               }
-               preg_match("/avatar='(.*?)'/ism", $attributes, $matches);
-               if (!empty($matches[1])) {
-                       $profiledata["photo"] = $matches[1];
-               }
-               preg_match('/avatar="(.*?)"/ism', $attributes, $matches);
-               if (!empty($matches[1])) {
-                       $profiledata["photo"] = $matches[1];
+
+               if (!empty($shared['avatar'])) {
+                       $profiledata['photo'] = $shared['avatar'];
                }
+
                $profiledata["nickname"] = $profiledata["name"];
                $profiledata["network"] = Protocol::matchByProfileUrl($profiledata["url"]);
 
@@ -276,8 +245,8 @@ function display_content(App $a, $update = false, $update_uid = 0)
        if (isset($item_parent_uri)) {
                $parent = Item::selectFirst(['uid'], ['uri' => $item_parent_uri, 'wall' => true]);
                if (DBA::isResult($parent)) {
-                       $a->profile['uid'] = defaults($a->profile, 'uid', $parent['uid']);
-                       $a->profile['profile_uid'] = defaults($a->profile, 'profile_uid', $parent['uid']);
+                       $a->profile['uid'] = ($a->profile['uid'] ?? 0) ?: $parent['uid'];
+                       $a->profile['profile_uid'] = ($a->profile['profile_uid'] ?? 0) ?: $parent['uid'];
                        $is_remote_contact = Session::getRemoteContactID($a->profile['profile_uid']);
                        if ($is_remote_contact) {
                                $item_uid = $parent['uid'];
@@ -304,7 +273,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
                        'default_location' => $a->user['default-location'],
                        'nickname' => $a->user['nickname'],
                        'lockstate' => (is_array($a->user) && (strlen($a->user['allow_cid']) || strlen($a->user['allow_gid']) || strlen($a->user['deny_cid']) || strlen($a->user['deny_gid'])) ? 'lock' : 'unlock'),
-                       'acl' => ACL::getFullSelectorHTML($a->user, true),
+                       'acl' => ACL::getFullSelectorHTML($a->page, $a->user, true),
                        'bang' => '',
                        'visitor' => 'block',
                        'profile_uid' => local_user(),