Merge pull request #13375 from MrPetovan/bug/empty-timeline

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

diff --git a/src/Content/Widget.php b/src/Content/Widget.php
index c18a3041b0568c799a35d10c15954e66a7e1b84d..ce4548d1ad02ea73ba42e39d7292f6c4414da82a 100644 (file)
--- a/src/Content/Widget.php
+++ b/src/Content/Widget.php
@@ -102,7 +102,7 @@ class Widget
        public static function unavailableNetworks(): array
        {
                // Always hide content from these networks
-               $networks = [Protocol::PHANTOM, Protocol::FACEBOOK, Protocol::APPNET, Protocol::ZOT];
+               $networks = [Protocol::PHANTOM, Protocol::FACEBOOK, Protocol::APPNET, Protocol::TWITTER, Protocol::ZOT];
 
                if (!Addon::isEnabled("discourse")) {
                        $networks[] = Protocol::DISCOURSE;
@@ -116,10 +116,6 @@ class Widget
                        $networks[] = Protocol::PUMPIO;
                }
 
-               if (!Addon::isEnabled("twitter")) {
-                       $networks[] = Protocol::TWITTER;
-               }
-
                if (!Addon::isEnabled("tumblr")) {
                        $networks[] = Protocol::TUMBLR;
                }
@@ -476,7 +472,6 @@ class Widget
                        $nextday = substr($nextday, 4);
                        $dnow = substr($dnow, 0, 8) . '01';
                        $dthen = substr($dthen, 0, 8) . '01';
-                       
 
                        /*
                         * Starting with the current month, get the first and last days of every
@@ -496,7 +491,6 @@ class Widget
 
                                $ret[$dyear][] = [$str, $end_month, $start_month];
                                $dnow = DateTimeFormat::utc($dnow . ' -1 month', 'Y-m-d');
-                               
                        }
                }
 
@@ -508,7 +502,7 @@ class Widget
                $cutoff_year = intval(DateTimeFormat::localNow('Y')) - $visible_years;
                $cutoff = array_key_exists($cutoff_year, $ret);
 
-               $o = Renderer::replaceMacros(Renderer::getMarkupTemplate('widget/posted_date.tpl'),[
+               $o = Renderer::replaceMacros(Renderer::getMarkupTemplate('widget/posted_date.tpl'), [
                        '$title' => DI::l10n()->t('Archives'),
                        '$size' => $visible_years,
                        '$cutoff_year' => $cutoff_year,
@@ -543,7 +537,14 @@ class Widget
                        ['ref' => 'community', 'name' => DI::l10n()->t('Groups')],
                ];
 
-               return self::filter('accounttype', DI::l10n()->t('Account Types'), '',
-                       DI::l10n()->t('All'), $base, $accounts, $accounttype);
+               return self::filter(
+                       'accounttype',
+                       DI::l10n()->t('Account Types'),
+                       '',
+                       DI::l10n()->t('All'),
+                       $base,
+                       $accounts,
+                       $accounttype
+               );
        }
 }