X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FTerm.php;h=6a213d445b2df4c7b036c7c0728b8cd86a8d13a4;hb=2b0610eaf5ea67cc6b6a8e59b4f9c08249f90370;hp=da07659b4e3289f2575210ec6818d0f7a2c4e117;hpb=4874f7f8abebaf242e274d167ffd335897435cdf;p=friendica.git

diff --git a/src/Model/Term.php b/src/Model/Term.php
index da07659b4e..6a213d445b 100644
--- 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;
 			}
 
@@ -194,7 +192,9 @@ class Term
 
 	/**
 	 * @param integer $itemid item id
+	 * @param         $files
 	 * @return void
+	 * @throws \Exception
 	 */
 	public static function insertFromFileFieldByItemId($itemid, $files)
 	{
@@ -243,6 +243,8 @@ class Term
 	 *
 	 * @param array $item
 	 * @return array
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function populateTagsFromItem(&$item)
 	{
@@ -262,8 +264,8 @@ 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'];
@@ -272,6 +274,7 @@ class Term
 				'network' => $item['author-network'], 'url' => $item['author-link']];
 			$tag['url'] = Contact::magicLinkByContact($author, $tag['url']);
 
+			$prefix = '';
 			if ($tag['type'] == TERM_HASHTAG) {
 				if ($orig_tag != $tag['url']) {
 					$item['body'] = str_replace($orig_tag, $tag['url'], $item['body']);
@@ -293,8 +296,10 @@ class Term
 
 	/**
 	 * Delete all tags from an item
+	 *
 	 * @param int itemid - choose from which item the tags will be removed
-	 * @param array type - items type. default is [TERM_HASHTAG, TERM_MENTION]
+	 * @param array $type
+	 * @throws \Exception
 	 */
 	public static function deleteByItemId($itemid, $type = [TERM_HASHTAG, TERM_MENTION])
 	{