Merge remote-tracking branch 'upstream/develop' into no-term2

[friendica.git] / include / conversation.php

diff --git a/include/conversation.php b/include/conversation.php
index 0ae8dd14a129f3f64cde7d3ef1cfb4e19968a730..a4fe9c00e397a7f6053990ed2997a589b5248330 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -22,7 +22,6 @@
 use Friendica\App;
 use Friendica\Content\ContactSelector;
 use Friendica\Content\Feature;
-use Friendica\Content\Pager;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
@@ -34,7 +33,7 @@ use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
 use Friendica\Model\Profile;
-use Friendica\Model\Term;
+use Friendica\Model\Tag;
 use Friendica\Object\Post;
 use Friendica\Object\Thread;
 use Friendica\Protocol\Activity;
@@ -527,7 +526,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
                                        $profile_name = $item['author-link'];
                                }
 
-                               $tags = Term::populateTagsFromItem($item);
+                               $tags = Tag::populateFromItem($item);
 
                                $author = ['uid' => 0, 'id' => $item['author-id'],
                                        'network' => $item['author-network'], 'url' => $item['author-link']];
@@ -837,15 +836,15 @@ function item_photo_menu($item) {
 
        if (!empty($pcid)) {
                $contact_url = 'contact/' . $pcid;
-               $posts_link = 'contact/' . $pcid . '/posts';
-               $block_link = 'contact/' . $pcid . '/block';
-               $ignore_link = 'contact/' . $pcid . '/ignore';
+               $posts_link  = $contact_url . '/posts';
+               $block_link  = $contact_url . '/block';
+               $ignore_link = $contact_url . '/ignore';
        }
 
        if ($cid && !$item['self']) {
-               $poke_link = 'poke?c=' . $cid;
                $contact_url = 'contact/' . $cid;
-               $posts_link = 'contact/' . $cid . '/posts';
+               $poke_link   = $contact_url . '/poke';
+               $posts_link  = $contact_url . '/posts';
 
                if (in_array($network, [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA])) {
                        $pm_url = 'message/new/' . $cid;