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

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

diff --git a/lib/grouptagcloudsection.php b/lib/grouptagcloudsection.php
index 5b914c00734a972bed9111c4bfafbea7605a5b77..68af4d307446396b9842a64a46c424770bbe4936 100644 (file)
--- a/lib/grouptagcloudsection.php
+++ b/lib/grouptagcloudsection.php
@@ -54,7 +54,7 @@ class GroupTagCloudSection extends TagCloudSection
     {
         // TRANS: Title for group tag cloud section.
         // TRANS: %s is a group name.
-        return sprintf(_('Tags in %s group\'s notices'), $this->group->nickname);
+        return _('Tags');
     }
 
     function getTags()
@@ -76,7 +76,7 @@ class GroupTagCloudSection extends TagCloudSection
 
         $namestring = implode(',', $quoted);
 
-        $qry = 'SELECT notice_tag.tag, '.
+        $qry = 'SELECT notice_tag.tag, notice_tag.notice_id, '.
           $weightexpr . ' as weight ' .
           'FROM notice_tag JOIN notice ' .
           'ON notice_tag.notice_id = notice.id ' .