X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FHashtag.php;h=365e77572cfa50f1227534b273ee4dfd4652e1fc;hb=52ea22505d109d07033066d4a45c1b785ceade33;hp=b016b4da407ccf3dd3f5b0e40c9d8c0ca8062933;hpb=0e01568ccd5b5ce081eff83e2ed0b888e0b6db55;p=friendica.git

diff --git a/src/Module/Hashtag.php b/src/Module/Hashtag.php
index b016b4da40..365e77572c 100644
--- a/src/Module/Hashtag.php
+++ b/src/Module/Hashtag.php
@@ -1,7 +1,24 @@
 <?php
 /**
- * @file src/Module/Hashtag.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/>.
+ *
  */
+
 namespace Friendica\Module;
 
 use Friendica\BaseModule;
@@ -9,30 +26,23 @@ use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Util\Strings;
 
-require_once 'include/dba.php';
-require_once 'include/text.php';
-
 /**
  * Hashtag module.
  */
 class Hashtag extends BaseModule
 {
-
-	public static function content()
+	public static function content(array $parameters = [])
 	{
 		$result = [];
 
-		$t = Strings::escapeTags($_REQUEST['t']);
+		$t = Strings::escapeHtml($_REQUEST['t']);
 		if (empty($t)) {
 			System::jsonExit($result);
 		}
 
-		$taglist = DBA::p("SELECT DISTINCT(`term`) FROM `term` WHERE `term` LIKE ? AND `type` = ? ORDER BY `term`",
-			$t . '%',
-			intval(TERM_HASHTAG)
-		);
+		$taglist = DBA::select('tag', ['name'], ["`name` LIKE ?", $t . "%"], ['order' => ['name'], 'limit' => 100]);
 		while ($tag = DBA::fetch($taglist)) {
-			$result[] = ['text' => $tag['term']];
+			$result[] = ['text' => $tag['name']];
 		}
 		DBA::close($taglist);