X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FModel%2FTerm.php;h=6a213d445b2df4c7b036c7c0728b8cd86a8d13a4;hb=2b0610eaf5ea67cc6b6a8e59b4f9c08249f90370;hp=3718887122436ad35784b0f7b1f3b7cc8fc91620;hpb=6b845b35d3c525a7fdef3443c39ce31dd9a8ada6;p=friendica.git diff --git a/src/Model/Term.php b/src/Model/Term.php index 3718887122..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) @@ -156,7 +152,7 @@ class Term $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; } @@ -196,7 +192,9 @@ class Term /** * @param integer $itemid item id + * @param $files * @return void + * @throws \Exception */ public static function insertFromFileFieldByItemId($itemid, $files) { @@ -245,6 +243,8 @@ class Term * * @param array $item * @return array + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ public static function populateTagsFromItem(&$item) { @@ -274,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']); @@ -295,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]) {