Merge remote-tracking branch 'upstream/develop' into user-defined-channels

[friendica.git] / src / Module / Update / Network.php

diff --git a/src/Module/Update/Network.php b/src/Module/Update/Network.php
index 59ab0e2eb19cc5df3edd462ff37e9033e42b03ba..612d4079c8cb73654e9ab9b518a3e4c2c248af85 100644 (file)
--- a/src/Module/Update/Network.php
+++ b/src/Module/Update/Network.php
@@ -35,15 +35,21 @@ class Network extends NetworkModule
 
                $this->parseRequest($request);
 
-               $profile_uid = intval($request['p']);
-
                $o = '';
 
-               if (empty($request['force'])) {
+               if (!$this->update && !$this->force) {
                        System::htmlUpdateExit($o);
                }
 
-               $o = $this->conversation->render($this->getItems(), Conversation::MODE_NETWORK, $profile_uid, false, $this->getOrder(), $this->session->getLocalUserId());
+               if ($this->timeline->isChannel($this->selectedTab, $this->session->getLocalUserId())) {
+                       $items = $this->getChannelItems();
+               } elseif ($this->timeline->isCommunity($this->selectedTab)) {
+                       $items = $this->getCommunityItems();
+               } else {
+                       $items = $this->getItems();
+               }
+
+               $o = $this->conversation->render($items, Conversation::MODE_NETWORK, true, false, $this->getOrder(), $this->session->getLocalUserId());
 
                System::htmlUpdateExit($o);
        }