Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x

6 files changed, 29 insertions, 15 deletions

diff --git a/lib/noticelist.php b/lib/noticelist.php
index 55dd902b4..004905056 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -187,7 +187,7 @@ class NoticeListItem extends Widget
 
     function showNotice()
     {
-if (0)
+if(0)
         $this->out->elementStart('entry-title');
 else
 
@@ -236,7 +236,7 @@ else
             $clip .= '.png';
             $top = '20px';
         }
-if (0)
+if(0)
         $this->out->elementStart('div', 'entry-attachments');
 else
         $this->out->elementStart('p', array('class' => 'entry-attachments', 'style' => "float: right; width: $width_att; background: url($clip) no-repeat; text-align: right; height: $height;"));
diff --git a/lib/profileaction.php b/lib/profileaction.php
index 1f2e30994..a3437ff4d 100644
--- a/lib/profileaction.php
+++ b/lib/profileaction.php
@@ -49,16 +49,17 @@ require_once INSTALLDIR.'/lib/groupminilist.php';
 
 class ProfileAction extends Action
 {
-    var $user = null;
-    var $page = null;
+    var $user    = null;
+    var $page    = null;
     var $profile = null;
+    var $tag     = null;
 
     function prepare($args)
     {
         parent::prepare($args);
 
         $nickname_arg = $this->arg('nickname');
-        $nickname = common_canonical_nickname($nickname_arg);
+        $nickname     = common_canonical_nickname($nickname_arg);
 
         // Permanent redirect on non-canonical nickname
 
@@ -85,10 +86,9 @@ class ProfileAction extends Action
             return false;
         }
 
+        $this->tag = $this->trimmed('tag');
         $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
-
         common_set_returnto($this->selfUrl());
-
         return true;
     }
 
@@ -244,4 +244,5 @@ class ProfileAction extends Action
 
         $this->elementEnd('div');
     }
-}
\ No newline at end of file
+}
+
diff --git a/lib/router.php b/lib/router.php
index 635e1d77e..70ee0f3fb 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -426,6 +426,16 @@ class Router
                     array('size' => '(original|96|48|24)',
                           'nickname' => '[a-zA-Z0-9]{1,64}'));
 
+        $m->connect(':nickname/tag/:tag/rss',
+            array('action' => 'userrss'),
+            array('nickname' => '[a-zA-Z0-9]{1,64}'),
+            array('tag' => '[a-zA-Z0-9]+'));
+
+        $m->connect(':nickname/tag/:tag',
+                    array('action' => 'showstream'),
+                    array('nickname' => '[a-zA-Z0-9]{1,64}'),
+                    array('tag' => '[a-zA-Z0-9]+'));
+
         $m->connect(':nickname',
                     array('action' => 'showstream'),
                     array('nickname' => '[a-zA-Z0-9]{1,64}'));
diff --git a/lib/rssaction.php b/lib/rssaction.php
index ddba862dc..2f25ed7e4 100644
--- a/lib/rssaction.php
+++ b/lib/rssaction.php
@@ -97,7 +97,11 @@ class Rss10Action extends Action
         // Parent handling, including cache check
         parent::handle($args);
         // Get the list of notices
-        $this->notices = $this->getNotices($this->limit);
+        if (empty($this->tag)) {
+            $this->notices = $this->getNotices($this->limit);
+        } else {
+            $this->notices = $this->getTaggedNotices($this->tag, $this->limit);
+        }
         $this->showRss();
     }
 
diff --git a/lib/tagcloudsection.php b/lib/tagcloudsection.php
index ff2aca6d6..62f7d8961 100644
--- a/lib/tagcloudsection.php
+++ b/lib/tagcloudsection.php
@@ -114,7 +114,11 @@ 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()
diff --git a/lib/util.php b/lib/util.php
index 25c0fb0a1..fbef8764a 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -496,11 +496,6 @@ function common_linkify($url) {
     }
 
     $attrs = array('href' => $longurl, 'rel' => 'external');
-if(0){
-    if ($longurl !== $url) {
-        $attrs['title'] = $longurl;
-    }
-}
     return XMLStringer::estring('a', $attrs, $display);
 }