Clean up tag claud (remove "item_condition()" call)

diff --git a/src/Content/Widget/TagCloud.php b/src/Content/Widget/TagCloud.php
index 7d96587c258fadd8d8ee1ff40583884648fb3ebd..53c4daae4512ea522d49a484031415ba94365e3f 100644 (file)
--- a/src/Content/Widget/TagCloud.php
+++ b/src/Content/Widget/TagCloud.php
@@ -74,7 +74,6 @@ 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);
                $limit = $count ? sprintf('LIMIT %d', intval($count)) : '';
 
@@ -91,13 +90,12 @@ class TagCloud
                // Fetch tags
                $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
                );