Merge branch '0.8.x' of git://gitorious.org/~brion/statusnet/brion-fixes into 0.8.x

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

diff --git a/actions/showstream.php b/actions/showstream.php
index 4d3067eed37275e35144fc2ecd292e956a0c4954..89285b13c7aae1cd4982ce8f7e411f96bbd84f9f 100644 (file)
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -380,8 +380,13 @@ class ShowstreamAction extends ProfileAction
             $this->showEmptyListMessage();
         }
 
+        $args = array('nickname' => $this->user->nickname);
+        if (!empty($this->tag))
+        {
+            $args['tag'] = $this->tag;
+        }
         $this->pagination($this->page>1, $cnt>NOTICES_PER_PAGE, $this->page,
-                          'showstream', array('nickname' => $this->user->nickname));
+                          'showstream', $args);
     }
 
     function showAnonymousMessage()