X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FContent%2FWidget%2FTagCloud.php;h=309f9a5bdb4e53ad97fce9dfa6929a7b047aea74;hb=2f7f9ffdd827dca6996a894fac662e7c77f8e713;hp=7d96587c258fadd8d8ee1ff40583884648fb3ebd;hpb=41423e578a623c267cf59ecd5d5834cf443f9571;p=friendica.git

diff --git a/src/Content/Widget/TagCloud.php b/src/Content/Widget/TagCloud.php
index 7d96587c25..309f9a5bdb 100644
--- a/src/Content/Widget/TagCloud.php
+++ b/src/Content/Widget/TagCloud.php
@@ -6,13 +6,13 @@
 
 namespace Friendica\Content\Widget;
 
-use dba;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
+use Friendica\Model\Item;
+use Friendica\Util\Security;
 
 require_once 'include/dba.php';
-require_once 'include/security.php';
 
 /**
  * TagCloud widget
@@ -38,7 +38,7 @@ class TagCloud
 		$o = '';
 		$r = self::tagadelic($uid, $count, $owner_id, $flags, $type);
 		if (count($r)) {
-			$contact = dba::selectFirst('contact', ['url'], ['uid' => $uid, 'self' => true]);
+			$contact = DBA::selectFirst('contact', ['url'], ['uid' => $uid, 'self' => true]);
 			$url = System::removedBaseUrl($contact['url']);
 
 			foreach ($r as $rr) {
@@ -74,8 +74,7 @@ class TagCloud
 	 */
 	private static function tagadelic($uid, $count = 0, $owner_id = 0, $flags = '', $type = TERM_HASHTAG)
 	{
-		$item_condition = item_condition();
-		$sql_options = item_permissions_sql($uid);
+		$sql_options = Item::getPermissionsSQLByUserId($uid);
 		$limit = $count ? sprintf('LIMIT %d', intval($count)) : '';
 
 		if ($flags) {
@@ -89,19 +88,18 @@ class TagCloud
 		}
 
 		// Fetch tags
-		$r = dba::p("SELECT `term`, COUNT(`term`) AS `total` FROM `term`
+		$r = DBA::p("SELECT `term`, COUNT(`term`) AS `total` FROM `term`
 			LEFT JOIN `item` ON `term`.`oid` = `item`.`id`
-			LEFT JOIN `user-item` ON `user-item`.`iid` = `item`.`id` AND `user-item`.`uid` = ?
 			WHERE `term`.`uid` = ? AND `term`.`type` = ?
 			AND `term`.`otype` = ?
-			AND $item_condition $sql_options
+			AND `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
+			$sql_options
 			GROUP BY `term` ORDER BY `total` DESC $limit",
 			$uid,
-			$uid,
 			$type,
 			TERM_OBJ_POST
 		);
-		if (!DBM::is_result($r)) {
+		if (!DBA::isResult($r)) {
 			return [];
 		}