Now storing the "manually approve" data / fix update routine

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

diff --git a/src/Content/Widget.php b/src/Content/Widget.php
index ab9bb8882893f148868b490363c36eadc1ef8a3c..35e8913e0869866dcf9c33778b46c5d2d6d8cb8b 100644 (file)
--- a/src/Content/Widget.php
+++ b/src/Content/Widget.php
@@ -21,9 +21,6 @@ use Friendica\Model\Profile;
 use Friendica\Util\Strings;
 use Friendica\Util\XML;
 
-require_once 'boot.php';
-require_once 'include/dba.php';
-
 class Widget
 {
        /**
@@ -47,7 +44,7 @@ class Widget
         */
        public static function findPeople()
        {
-               $a = get_app();
+               $a = \get_app();
                $global_dir = Config::get('system', 'directory');
 
                if (Config::get('system', 'invitation_only')) {
@@ -140,7 +137,7 @@ class Widget
 
                $extra_sql = self::unavailableNetworks();
 
-               $r = DBA::p("SELECT DISTINCT(`network`) FROM `contact` WHERE `uid` = ? AND `network` != '' $extra_sql ORDER BY `network`",
+               $r = DBA::p("SELECT DISTINCT(`network`) FROM `contact` WHERE `uid` = ? AND NOT `deleted` AND `network` != '' $extra_sql ORDER BY `network`",
                        local_user()
                );
 
@@ -176,10 +173,6 @@ class Widget
                        return '';
                }
 
-               if (!Feature::isEnabled(local_user(), 'filing')) {
-                       return '';
-               }
-
                $saved = PConfig::get(local_user(), 'system', 'filetags');
                if (!strlen($saved)) {
                        return;
@@ -214,7 +207,7 @@ class Widget
         */
        public static function categories($baseurl, $selected = '')
        {
-               $a = get_app();
+               $a = \get_app();
 
                if (!Feature::isEnabled($a->profile['profile_uid'], 'categories')) {
                        return '';
@@ -323,7 +316,7 @@ class Widget
         */
        public static function tagCloud($limit = 50)
        {
-               $a = get_app();
+               $a = \get_app();
 
                if (!$a->profile['profile_uid'] || !$a->profile['url']) {
                        return '';