From: Mikael Nordfeldth <mmn@hethane.se>
Date: Tue, 11 Jul 2017 19:16:30 +0000 (+0200)
Subject: Another solution to merge request !146
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=9b19688d6566b776e244273cc9907bd43b54b005;p=quix0rs-gnu-social.git

Another solution to merge request !146
---

diff --git a/actions/showstream.php b/actions/showstream.php
index 6fe9451633..79a3706d77 100644
--- 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()