From d11125d2341ec78847ca4c37789205cb576dc054 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 12 Jul 2020 22:52:51 -0400 Subject: [PATCH] Move network sidebar widget additional features to core - Make Archives filter core - Make Protocol filter core --- src/Content/Feature.php | 7 ------- src/Content/Widget.php | 8 -------- 2 files changed, 15 deletions(-) diff --git a/src/Content/Feature.php b/src/Content/Feature.php index ee755a2b3..b35aa3f36 100644 --- a/src/Content/Feature.php +++ b/src/Content/Feature.php @@ -107,13 +107,6 @@ class Feature ['explicit_mentions', DI::l10n()->t('Explicit Mentions'), DI::l10n()->t('Add explicit mentions to comment box for manual control over who gets mentioned in replies.'), false, DI::config()->get('feature_lock', 'explicit_mentions', false)], ], - // Network sidebar widgets - 'widgets' => [ - DI::l10n()->t('Network Sidebar'), - ['archives', DI::l10n()->t('Archives'), DI::l10n()->t('Ability to select posts by date ranges'), false, DI::config()->get('feature_lock', 'archives', false)], - ['networks', DI::l10n()->t('Protocol Filter'), DI::l10n()->t('Enable widget to display Network posts only from selected protocols'), false, DI::config()->get('feature_lock', 'networks', false)], - ], - // Item tools 'tools' => [ DI::l10n()->t('Post/Comment Tools'), diff --git a/src/Content/Widget.php b/src/Content/Widget.php index 8c72f68f4..ffc5debb3 100644 --- a/src/Content/Widget.php +++ b/src/Content/Widget.php @@ -269,10 +269,6 @@ class Widget return ''; } - if (!Feature::isEnabled(local_user(), 'networks')) { - return ''; - } - $extra_sql = self::unavailableNetworks(); $r = DBA::p("SELECT DISTINCT(`network`) FROM `contact` WHERE `uid` = ? AND NOT `deleted` AND `network` != '' $extra_sql ORDER BY `network`", @@ -497,10 +493,6 @@ class Widget { $o = ''; - if (!Feature::isEnabled($uid, 'archives')) { - return $o; - } - $visible_years = DI::pConfig()->get($uid, 'system', 'archive_visible_years', 5); /* arrange the list in years */