Pagination of user/tag was navigating to wrong page.

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

diff --git a/actions/showstream.php b/actions/showstream.php
index 93730812c4db3d85d74a4fd97baa0cc5188662a9..89285b13c7aae1cd4982ce8f7e411f96bbd84f9f 100644 (file)
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
@@ -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()