Remove deprecated App::getBaseURL() - process methods to DI::baseUrl()->get()

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

diff --git a/src/Content/Widget.php b/src/Content/Widget.php
index 90974427965538d5425637361e7c437a21bad759..b1e925a6621511c1d2605eb34ee81fb4c9ca9c39 100644 (file)
--- a/src/Content/Widget.php
+++ b/src/Content/Widget.php
@@ -11,6 +11,7 @@ use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
+use Friendica\Core\Session;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\FileTag;
@@ -88,6 +89,10 @@ class Widget
                // Always hide content from these networks
                $networks = ['face', 'apdn'];
 
+               if (!Addon::isEnabled("discourse")) {
+                       $networks[] = Protocol::DISCOURSE;
+               }
+
                if (!Addon::isEnabled("statusnet")) {
                        $networks[] = Protocol::STATUSNET;
                }
@@ -273,6 +278,10 @@ class Widget
                foreach (FileTag::fileToArray($saved) as $savedFolderName) {
                        $terms[] = ['ref' => $savedFolderName, 'name' => $savedFolderName];
                }
+               
+               usort($terms, function ($a, $b) {
+                       return strcmp($a['name'], $b['name']);
+               });
 
                return self::filter(
                        'file',
@@ -339,7 +348,7 @@ class Widget
 
                $zcid = 0;
 
-               $cid = remote_user($profile_uid);
+               $cid = Session::getRemoteContactID($profile_uid);
 
                if (!$cid) {
                        if (Profile::getMyURL()) {