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 5f7f234e046506b670e488a030e4b5e74a45848b..612d4079c8cb73654e9ab9b518a3e4c2c248af85 100644 (file)
--- a/src/Module/Update/Network.php
+++ b/src/Module/Update/Network.php
@@ -37,11 +37,11 @@ class Network extends NetworkModule
 
                $o = '';
 
-               if (!$this->force) {
+               if (!$this->update && !$this->force) {
                        System::htmlUpdateExit($o);
                }
 
-               if ($this->timeline->isChannel($this->selectedTab)) {
+               if ($this->timeline->isChannel($this->selectedTab, $this->session->getLocalUserId())) {
                        $items = $this->getChannelItems();
                } elseif ($this->timeline->isCommunity($this->selectedTab)) {
                        $items = $this->getCommunityItems();