Merge pull request #8647 from annando/annando/issue8619

[friendica.git] / mod / photos.php

diff --git a/mod/photos.php b/mod/photos.php
index f4983a8380449b5681431958f0642e1e5dba02da..7a647e06b94ef64f2440fe14802b2496375c0bb4 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -509,9 +509,9 @@ function photos_post(App $a)
 
                                                if ($profile) {
                                                        if (!empty($contact)) {
-                                                               $taginfo[] = [$newname, $profile, $notify, $contact, '@[url=' . str_replace(',', '%2c', $profile) . ']' . $newname . '[/url]'];
+                                                               $taginfo[] = [$newname, $profile, $notify, $contact];
                                                        } else {
-                                                               $taginfo[] = [$newname, $profile, $notify, null, '@[url=' . $profile . ']' . $newname . '[/url]'];
+                                                               $taginfo[] = [$newname, $profile, $notify, null];
                                                        }
 
                                                        $profile = str_replace(',', '%2c', $profile);
@@ -579,7 +579,6 @@ function photos_post(App $a)
                                        $arr['gravity']       = GRAVITY_PARENT;
                                        $arr['object-type']   = Activity\ObjectType::PERSON;
                                        $arr['target-type']   = Activity\ObjectType::IMAGE;
-                                       $arr['tag']           = $tagged[4];
                                        $arr['inform']        = $tagged[2];
                                        $arr['origin']        = 1;
                                        $arr['body']          = DI::l10n()->t('%1$s was tagged in %2$s by %3$s', '[url=' . $tagged[1] . ']' . $tagged[0] . '[/url]', '[url=' . DI::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $photo['resource-id'] . ']' . DI::l10n()->t('a photo') . '[/url]', '[url=' . $owner_record['url'] . ']' . $owner_record['name'] . '[/url]') ;
@@ -1307,9 +1306,9 @@ function photos_content(App $a)
                }
 
                $tags = null;
-               $tag_text = Tag::tagTextFromItemId($link_item['uri-id']);
 
-               if (!empty($link_item['id']) && !empty($tag_text)) {
+               if (!empty($link_item['id'])) {
+                       $tag_text = Tag::getCSVByURIId($link_item['uri-id']);
                        $arr = explode(',', $tag_text);
                        // parse tags and add links
                        $tag_arr = [];