Merge remote-tracking branch 'upstream/master' into social-master

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

diff --git a/lib/tagcloudsection.php b/lib/tagcloudsection.php
index ed84999f0c0e1cc6894215d0c7831f3f55aeb706..9f7320f2de41d750c96da518299e5ab843e4efac 100644 (file)
--- a/lib/tagcloudsection.php
+++ b/lib/tagcloudsection.php
@@ -27,11 +27,11 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-define('TAGS_PER_SECTION', 20);
+define('TAGS_PER_SECTION', 10);
 
 /**
  * Base class for sections
@@ -45,15 +45,16 @@ define('TAGS_PER_SECTION', 20);
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-
 class TagCloudSection extends Section
 {
     function showContent()
     {
         $tags = $this->getTags();
+        //* NOISY-DEBUG: */ common_debug('[' . __METHOD__ . ':' . __LINE__ . '] tags[]=' . gettype($tags));
 
         if (!$tags) {
-            $this->out->element('p', null, _('None'));
+            // TRANS: Content displayed in a tag cloud section if there are no tags.
+            $this->out->element('p', null, _m('NOTAGS','None'));
             return false;
         }
 
@@ -63,12 +64,16 @@ class TagCloudSection extends Section
         $sum = 0;
 
         while ($tags->fetch() && ++$cnt <= TAGS_PER_SECTION) {
-            $tw[$tags->tag] = $tags->weight;
-            $sum += $tags->weight;
+            // Check scope of tag to current profile (including guests)
+            if ($tags->isCurrentProfileInScope()) {
+                $tw[$tags->tag] = $tags->weight;
+                $sum += $tags->weight;
+            }
         }
 
         if ($cnt == 0) {
-            $this->out->element('p', null, _('(None)'));
+            // TRANS: Content displayed in a tag cloud section if there are no tags.
+            $this->out->element('p', null, _m('NOTAGS','None'));
             return false;
         }
 
@@ -114,11 +119,10 @@ class TagCloudSection extends Section
 
     function tagUrl($tag)
     {
-        if ('showstream' === $this->out->trimmed('action')) {
-            return common_local_url('showstream', array('nickname' => $this->out->profile->nickname, 'tag' => $tag));
-        } else {
-            return common_local_url('tag', array('tag' => $tag));
+        if ($this->out instanceof ShowstreamAction) {
+            return common_local_url('showstream', array('nickname' => $this->out->getTarget()->getNickname(), 'tag' => $tag));
         }
+        return common_local_url('tag', array('tag' => $tag));
     }
 
     function divId()