removed Profile_block::get, changed to use pkeyGet

[quix0rs-gnu-social.git] / actions / tag.php

diff --git a/actions/tag.php b/actions/tag.php
index f8fea341acd8286a11e2b1dcfc1a255963ed98ac..50b76dbcdb40830cbf541fe967dd7509b89dab51 100644 (file)
--- a/actions/tag.php
+++ b/actions/tag.php
@@ -35,7 +35,6 @@ class TagAction extends StreamAction {
                        common_show_header(sprintf(_("Notices tagged with %s"), $tag),
                                                           array($this, 'show_header'), $tag,
                                                           array($this, 'show_top'));
-
                        $this->show_notices($tag);
                } else {
                        common_show_header(_("Tags"),
@@ -48,7 +47,7 @@ class TagAction extends StreamAction {
        }
 
        function show_header($tag = false) {
-               if (false && $tag) {
+               if ($tag) {
                        common_element('link', array('rel' => 'alternate',
                                                                                 'href' => common_local_url('tagrss', array('tag' => $tag)),
                                                                                 'type' => 'application/rss+xml',
@@ -67,21 +66,14 @@ class TagAction extends StreamAction {
                        common_element_start('div', 'instructions');
                        common_raw($output);
                        common_element_end('div');
+                       $this->public_views_menu();
                }
-
-               common_element_start('ul', array('id' => 'nav_views'));
-
-               common_menu_item(common_local_url('tags'),
-                                                _('Recent Tags'),
-                                                _('Recent Tags'),
-                                                !$tag);
-               if ($tag) {
-                       common_menu_item(common_local_url('tag', array('tag' => $tag)),
-                                                        '#' . $tag,
-                                                        sprintf(_("Notices tagged with %s"), $tag),
-                                                        true);
+               else {
+                       $this->show_feeds_list(array(0=>array('href'=>common_local_url('tagrss'),
+                                                                                                 'type' => 'rss',
+                                                                                                 'version' => 'RSS 1.0',
+                                                                                                 'item' => 'tagrss')));
                }
-               common_element_end('ul');
        }
 
        function show_tags()
@@ -98,9 +90,9 @@ class TagAction extends StreamAction {
                #Add the aggregated columns...
                $tags->selectAdd('max(notice_id) as last_notice_id');
                if(common_config('db','type')=='pgsql') {
-                       $calc='sum(exp(-extract(epoch from (now()-created))/%f)) as weight';
+                       $calc='sum(exp(-extract(epoch from (now()-created))/%s)) as weight';
                } else {
-                       $calc='sum(exp(-(now() - created)/%f)) as weight';
+                       $calc='sum(exp(-(now() - created)/%s)) as weight';
                }
                $tags->selectAdd(sprintf($calc, common_config('tag', 'dropoff')));
                $tags->groupBy('tag');
@@ -159,23 +151,20 @@ class TagAction extends StreamAction {
 
        function show_notices($tag) {
 
-               $notices = Notice_tag::getStream((($page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE + 1);
+               $cnt = 0;
                
-               if ($cnt > 0) {
+               $page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
+
+               $notice = Notice_tag::getStream($tag, (($page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE + 1);
+
+               if ($notice) {
                        common_element_start('ul', array('id' => 'notices'));
-                       for ($i = 0; $i < min($cnt, NOTICES_PER_PAGE); $i++) {
-                               if ($tags->fetch()) {
-                                       $notice = new Notice();
-                                       $notice->id = $tags->notice_id;
-                                       $result = $notice->find(true);
-                                       if (!$result) {
-                                               continue;
-                                       }
-                                       $this->show_notice($notice);
-                               } else {
-                                       // shouldn't happen!
+                       while ($notice->fetch()) {
+                               $cnt++;
+                               if ($cnt > NOTICES_PER_PAGE) {
                                        break;
                                }
+                               $this->show_notice($notice);
                        }
                        common_element_end('ul');
                }