Merge pull request #13646 from annando/page-drop

[friendica.git] / src / Content / Widget.php

diff --git a/src/Content/Widget.php b/src/Content/Widget.php
index 7078c4fe06b7d5b173c1b5ab45c9163028460e66..3147e99a5674ddcd52ac9de41451d5ccd8b2513d 100644 (file)
--- a/src/Content/Widget.php
+++ b/src/Content/Widget.php
@@ -562,19 +562,25 @@ class Widget
 
                $enabled = DI::pConfig()->get($uid, 'system', 'enabled_timelines', []);
 
-               foreach (DI::TimelineFactory()->getNetworkFeeds('') as $channel) {
+               foreach (DI::NetworkFactory()->getTimelines('') as $channel) {
                        if (empty($enabled) || in_array($channel->code, $enabled)) {
                                $channels[] = ['ref' => $channel->code, 'name' => $channel->label];
                        }
                }
 
-               foreach (DI::TimelineFactory()->getChannelsForUser($uid) as $channel) {
+               foreach (DI::ChannelFactory()->getTimelines($uid) as $channel) {
                        if (empty($enabled) || in_array($channel->code, $enabled)) {
                                $channels[] = ['ref' => $channel->code, 'name' => $channel->label];
                        }
                }
 
-               foreach (DI::TimelineFactory()->getCommunities(true) as $community) {
+               foreach (DI::userDefinedChannel()->selectByUid($uid) as $channel) {
+                       if (empty($enabled) || in_array($channel->code, $enabled)) {
+                               $channels[] = ['ref' => $channel->code, 'name' => $channel->label];
+                       }
+               }
+
+               foreach (DI::CommunityFactory()->getTimelines(true) as $community) {
                        if (empty($enabled) || in_array($community->code, $enabled)) {
                                $channels[] = ['ref' => $community->code, 'name' => $community->label];
                        }