Merge branch 'master' of gitorious.org:social/mainline

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

diff --git a/lib/grouptagcloudsection.php b/lib/grouptagcloudsection.php
index 93699f62c85e4130c6fb257e5a94bc0a54959862..5ed14560ce7a6efde2db81f3d91f24c3738805d5 100644 (file)
--- a/lib/grouptagcloudsection.php
+++ b/lib/grouptagcloudsection.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
@@ -40,7 +40,6 @@ if (!defined('STATUSNET')) {
  * @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,16 +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()
     {
-        if (common_config('db', 'type') == 'pgsql') {
-            $weightexpr='sum(exp(-extract(epoch from (now() - notice_tag.created)) / %s))';
-        } else {
-            $weightexpr='sum(exp(-(now() - notice_tag.created) / %s))';
-        }
+        $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();
 
@@ -99,7 +97,6 @@ class GroupTagCloudSection extends TagCloudSection
 
         $tag = Memcached_DataObject::cachedQuery('Notice_tag',
                                                  sprintf($qry,
-                                                         common_config('tag', 'dropoff'),
                                                          $this->group->id,
                                                          $namestring),
                                                  3600);