Merge branch 'fixes/private_scope_on_tags' into social-master

[quix0rs-gnu-social.git] / lib / tagcloudsection.php

diff --git a/lib/tagcloudsection.php b/lib/tagcloudsection.php
index 561ffb077f6f8068496dbcbcf3040109397ddad3..ca72a27e521b38f161eedfffbca8759e23f34317 100644 (file)
--- a/lib/tagcloudsection.php
+++ b/lib/tagcloudsection.php
@@ -31,7 +31,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-define('TAGS_PER_SECTION', 20);
+define('TAGS_PER_SECTION', 10);
 
 /**
  * Base class for sections
@@ -51,7 +51,7 @@ class TagCloudSection extends Section
     {
         $tags = $this->getTags();
 
-        if (!$tags) {
+        if (!$tags instanceof Notice_tag) {
             // TRANS: Content displayed in a tag cloud section if there are no tags.
             $this->out->element('p', null, _m('NOTAGS','None'));
             return false;
@@ -63,8 +63,10 @@ class TagCloudSection extends Section
         $sum = 0;
 
         while ($tags->fetch() && ++$cnt <= TAGS_PER_SECTION) {
-            $tw[$tags->tag] = $tags->weight;
-            $sum += $tags->weight;
+            if ($tags->isCurrentProfileInScope()) {
+                $tw[$tags->tag] = $tags->weight;
+                $sum += $tags->weight;
+            }
         }
 
         if ($cnt == 0) {