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 14ceda0850b09b6918c4da00517370f6b31bad42..68af4d307446396b9842a64a46c424770bbe4936 100644 (file)
--- a/lib/grouptagcloudsection.php
+++ b/lib/grouptagcloudsection.php
@@ -40,7 +40,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-
 class GroupTagCloudSection extends TagCloudSection
 {
     var $group = null;
@@ -53,12 +52,15 @@ class GroupTagCloudSection extends TagCloudSection
 
     function title()
     {
-        return sprintf(_('Tags in %s group\'s notices'), $this->group->nickname);
+        // TRANS: Title for group tag cloud section.
+        // TRANS: %s is a group name.
+        return _('Tags');
     }
 
     function getTags()
     {
         $weightexpr = common_sql_weight('notice_tag.created', common_config('tag', 'dropoff'));
+        // @fixme should we use the cutoff too? Doesn't help with indexing per-group.
 
         $names = $this->group->getAliases();
 
@@ -74,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 ' .