Merge branch 'fixes/private_scope_on_tags' into social-master

[quix0rs-gnu-social.git] / actions / publictagcloud.php

diff --git a/actions/publictagcloud.php b/actions/publictagcloud.php
index 1f169cfc5f71afe7ca462491e689989aa0615319..8daf18d5042bd8b4dbe2653f6b3a8edb7f551b00 100644 (file)
--- a/actions/publictagcloud.php
+++ b/actions/publictagcloud.php
@@ -136,29 +136,10 @@ class PublictagcloudAction extends Action
             $sum = 0;
             while ($tags->fetch()) {
                 // Check scope:
-
-                // 1) Get notice object and set id
-                $notice = new Notice();
-                $notice->id    = $tags->notice_id;
-                $notice->scope = $tags->scope;
-
-                // Is it private scope?
-                if ($notice->isPrivateScope()) {
-                    // 2) Get current profile
-                    $profile = Profile::current();
-
-                    // Is the profile not set?
-                    if (!$profile instanceof Profile) {
-                        // Public viewer shall not see a tag from a private dent (privacy leak)
-                        continue;
-                    } elseif (!$notice->inScope($profile)) {
-                        // Current profile is not in scope (not allowed to see) of notice
-                        continue;
-                    }
+                if ($tags->isCurrentProfileInScope()) {
+                    $tw[$tags->tag] = $tags->weight;
+                    $sum += $tags->weight;
                 }
-
-                $tw[$tags->tag] = $tags->weight;
-                $sum += $tags->weight;
             }
 
             ksort($tw);