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 5d08fd6928d00d534d9696be1a92af44a079b33f..a4fe9c00e397a7f6053990ed2997a589b5248330 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -526,7 +526,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
                                        $profile_name = $item['author-link'];
                                }
 
-                               $tags = Tag::populateTagsFromItem($item);
+                               $tags = Tag::populateFromItem($item);
 
                                $author = ['uid' => 0, 'id' => $item['author-id'],
                                        'network' => $item['author-network'], 'url' => $item['author-link']];