Merge branch '0.7.x' into 0.8.x

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

diff --git a/lib/tagcloudsection.php b/lib/tagcloudsection.php
index 121dfc49905296d26ac44549ef95abc8480c2bb7..62f7d8961282659f7c12a4b0db2b57840cfc74da 100644 (file)
--- a/lib/tagcloudsection.php
+++ b/lib/tagcloudsection.php
@@ -53,6 +53,7 @@ class TagCloudSection extends Section
         $tags = $this->getTags();
 
         if (!$tags) {
+            $this->out->element('p', null, _('None'));
             return false;
         }
 
@@ -66,11 +67,16 @@ class TagCloudSection extends Section
             $sum += $tags->weight;
         }
 
+        if ($cnt == 0) {
+            $this->out->element('p', null, _('(None)'));
+            return false;
+        }
+
         ksort($tw);
 
         $this->out->elementStart('ul', 'tags xoxo tag-cloud');
         foreach ($tw as $tag => $weight) {
-            $this->showTag($tag, $weight, $weight/$sum);
+            $this->showTag($tag, $weight, ($sum == 0) ? 0 : $weight/$sum);
         }
         $this->out->elementEnd('ul');
 
@@ -108,6 +114,15 @@ class TagCloudSection extends Section
 
     function tagUrl($tag)
     {
-        return common_local_url('tag', array('tag' => $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));
+        }
+    }
+
+    function divId()
+    {
+        return 'tagcloud';
     }
 }