Simplify query merge, changed update behaviour

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

diff --git a/src/Module/Update/Channel.php b/src/Module/Update/Channel.php
index aceeae15a5456f54ff0fae154a97936834876b1a..333c63b2de754b974e3a61fe1a8e02a412b7497c 100644 (file)
--- a/src/Module/Update/Channel.php
+++ b/src/Module/Update/Channel.php
@@ -17,14 +17,12 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
- * See update_profile.php for documentation
  */
 
 namespace Friendica\Module\Update;
 
 use Friendica\Content\Conversation;
 use Friendica\Core\System;
-use Friendica\DI;
 use Friendica\Module\Conversation\Channel as ChannelModule;
 
 /**
@@ -36,11 +34,17 @@ class Channel extends ChannelModule
 {
        protected function rawContent(array $request = [])
        {
-               $this->parseRequest();
+               $this->parseRequest($request);
 
                $o = '';
                if (!empty($request['force'])) {
-                       $o = DI::conversation()->render(self::getItems(), Conversation::MODE_CHANNEL, true, false, 'created', DI::userSession()->getLocalUserId());
+                       if ($this->timeline->isChannel(self::$selectedTab)) {
+                               $items = $this->getChannelItems();
+                       } else {
+                               $items = $this->getCommunityItems();
+                       }
+
+                       $o = $this->conversation->render($items, Conversation::MODE_CHANNEL, true, false, 'created', $this->session->getLocalUserId());
                }
 
                System::htmlUpdateExit($o);