Merge branch 'nightly' into 'nightly'

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

diff --git a/actions/showstream.php b/actions/showstream.php
index 6fe9451633a844b3492c5ce57b690e8ba4f798c5..79a3706d77fbe688f8044be64cf706fe91d24f70 100644 (file)
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -230,13 +230,14 @@ class ShowstreamAction extends NoticestreamAction
             $this->showEmptyListMessage();
         }
 
-        $args = array('nickname' => $this->target->getNickname());
+        // either nickname or id will be used, depending on which action (showstream, userbyid...)
+        $args = array('nickname' => $this->target->getNickname(), 'id' => $this->target->getID());
         if (!empty($this->tag))
         {
             $args['tag'] = $this->tag;
         }
         $this->pagination($this->page>1, $cnt>NOTICES_PER_PAGE, $this->page,
-                          'showstream', $args);
+                          $this->getActionName(), $args);
     }
 
     function showAnonymousMessage()