X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fitems.php;h=4c7551e5c49f0a565a4b7b75dfde9339472b1d2a;hb=a16dba2941bb3507faa84a13df2001a61daa3e96;hp=ef55acab14a4fdcd826c97a311b985b9bef9024a;hpb=ab8997f9db910ba70c592bf106a7f5fc41a55b2d;p=friendica.git

diff --git a/include/items.php b/include/items.php
index ef55acab14..4c7551e5c4 100644
--- a/include/items.php
+++ b/include/items.php
@@ -1,9 +1,24 @@
 <?php
 /**
- * @file include/items.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
 
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
@@ -73,7 +88,7 @@ function add_page_info_data(array $data, $no_photos = false)
 		$preview = str_replace(["[", "]"], ["&#91;", "&#93;"], htmlentities($data["images"][0]["src"], ENT_QUOTES, 'UTF-8', false));
 		// if the preview picture is larger than 500 pixels then show it in a larger mode
 		// But only, if the picture isn't higher than large (To prevent huge posts)
-		if (!Config::get('system', 'always_show_preview') && ($data["images"][0]["width"] >= 500)
+		if (!DI::config()->get('system', 'always_show_preview') && ($data["images"][0]["width"] >= 500)
 			&& ($data["images"][0]["width"] >= $data["images"][0]["height"])) {
 			$text .= " image='".$preview."'";
 		} else {
@@ -88,8 +103,7 @@ function add_page_info_data(array $data, $no_photos = false)
 		$hashtags = "\n";
 		foreach ($data["keywords"] as $keyword) {
 			/// @TODO make a positive list of allowed characters
-			$hashtag = str_replace([" ", "+", "/", ".", "#", "'", "’", "`", "(", ")", "„", "“"],
-						["", "", "", "", "", "", "", "", "", "", "", ""], $keyword);
+			$hashtag = str_replace([' ', '+', '/', '.', '#', '@', "'", '"', '’', '`', '(', ')', '„', '“'], '', $keyword);
 			$hashtags .= "#[url=" . DI::baseUrl() . "/search?tag=" . $hashtag . "]" . $hashtag . "[/url] ";
 		}
 	}