Merge pull request #9802 from annando/mod-include

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

diff --git a/src/Model/Tag.php b/src/Model/Tag.php
index fb7f05ad7fb5983d14ae6ea09f924eb3d704504a..4371a6e46ac6d597b01e1223b674fdfb5441ef1b 100644 (file)
--- a/src/Model/Tag.php
+++ b/src/Model/Tag.php
@@ -70,8 +70,8 @@ class Tag
        public static function store(int $uriid, int $type, string $name, string $url = '', $probing = true)
        {
                if ($type == self::HASHTAG) {
-                       // Remove some common "garbarge" from tags
-                       $name = trim($name, "\x00..\x20\xFF#!@,;.:'/?!^°$%".'"');
+                       // Trim Unicode non-word characters
+                       $name = preg_replace('/(^\W+)|(\W+$)/us', '', $name);
 
                        $tags = explode(self::TAG_CHARACTER[self::HASHTAG], $name);
                        if (count($tags) > 1) {
@@ -340,7 +340,7 @@ class Tag
        public static function createImplicitMentions(int $uri_id, int $parent_uri_id)
        {
                // Always mention the direct parent author
-               $parent = Item::selectFirst(['author-link', 'author-name'], ['uri-id' => $parent_uri_id]);
+               $parent = Post::selectFirst(['author-link', 'author-name'], ['uri-id' => $parent_uri_id]);
                self::store($uri_id, self::IMPLICIT_MENTION, $parent['author-name'], $parent['author-link']);
 
                if (DI::config()->get('system', 'disable_implicit_mentions')) {