Merge pull request #6426 from MrPetovan/bug/6425-fix-infinite-scroll-url

[friendica.git] / src / Model / Term.php

diff --git a/src/Model/Term.php b/src/Model/Term.php
index 2870eb167d6d68b4fda69bb177c8936cfc75cf67..7f494fc4afb84c7ef7fac6ef08cfa4cde5f796f3 100644 (file)
--- a/src/Model/Term.php
+++ b/src/Model/Term.php
@@ -7,10 +7,6 @@ namespace Friendica\Model;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 
-require_once 'boot.php';
-require_once 'include/conversation.php';
-require_once 'include/dba.php';
-
 class Term
 {
        public static function tagTextFromItemId($itemid)
@@ -140,6 +136,7 @@ class Term
 
                                $type = TERM_HASHTAG;
                                $term = substr($tag, 1);
+                               $link = '';
                        } elseif ((substr(trim($tag), 0, 1) == '@') || (substr(trim($tag), 0, 1) == '!')) {
                                $type = TERM_MENTION;
 
@@ -152,9 +149,10 @@ class Term
                        } else { // This shouldn't happen
                                $type = TERM_HASHTAG;
                                $term = $tag;
+                               $link = '';
                        }
 
-                       if (DBA::exists('term', ['uid' => $message['uid'], 'otype' => TERM_OBJ_POST, 'oid' => $itemid, 'url' => $link])) {
+                       if (DBA::exists('term', ['uid' => $message['uid'], 'otype' => TERM_OBJ_POST, 'oid' => $itemid, 'term' => $term])) {
                                continue;
                        }
 
@@ -262,29 +260,29 @@ class Term
                );
 
                while ($tag = DBA::fetch($taglist)) {
-                       if ($tag["url"] == "") {
-                               $tag["url"] = $searchpath . $tag["term"];
+                       if ($tag['url'] == '') {
+                               $tag['url'] = $searchpath . rawurlencode($tag['term']);
                        }
 
-                       $orig_tag = $tag["url"];
+                       $orig_tag = $tag['url'];
 
                        $author = ['uid' => 0, 'id' => $item['author-id'],
                                'network' => $item['author-network'], 'url' => $item['author-link']];
-                       $tag["url"] = Contact::magicLinkByContact($author, $tag['url']);
+                       $tag['url'] = Contact::magicLinkByContact($author, $tag['url']);
 
-                       if ($tag["type"] == TERM_HASHTAG) {
-                               if ($orig_tag != $tag["url"]) {
-                                       $item['body'] = str_replace($orig_tag, $tag["url"], $item['body']);
+                       if ($tag['type'] == TERM_HASHTAG) {
+                               if ($orig_tag != $tag['url']) {
+                                       $item['body'] = str_replace($orig_tag, $tag['url'], $item['body']);
                                }
 
-                               $return['hashtags'][] = "#<a href=\"" . $tag["url"] . "\" target=\"_blank\">" . $tag["term"] . "</a>";
-                               $prefix = "#";
-                       } elseif ($tag["type"] == TERM_MENTION) {
-                               $return['mentions'][] = "@<a href=\"" . $tag["url"] . "\" target=\"_blank\">" . $tag["term"] . "</a>";
-                               $prefix = "@";
+                               $return['hashtags'][] = '#<a href="' . $tag['url'] . '" target="_blank">' . $tag['term'] . '</a>';
+                               $prefix = '#';
+                       } elseif ($tag['type'] == TERM_MENTION) {
+                               $return['mentions'][] = '@<a href="' . $tag['url'] . '" target="_blank">' . $tag['term'] . '</a>';
+                               $prefix = '@';
                        }
 
-                       $return['tags'][] = $prefix . "<a href=\"" . $tag["url"] . "\" target=\"_blank\">" . $tag["term"] . "</a>";
+                       $return['tags'][] = $prefix . '<a href="' . $tag['url'] . '" target="_blank">' . $tag['term'] . '</a>';
                }
                DBA::close($taglist);