X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FAddon.php;h=06f6a129675985e1d2feb433fa8292ac041f0e31;hb=34521c228bd69609fa4f475bb2e2e826723fcc16;hp=976b9799beb74ca733e3a6d1f327a1d29ca8010a;hpb=6454c1dee719d3fb45beb4edbe829d3ee8ce1a57;p=friendica.git

diff --git a/src/Core/Addon.php b/src/Core/Addon.php
index 976b9799be..06f6a12967 100644
--- a/src/Core/Addon.php
+++ b/src/Core/Addon.php
@@ -51,7 +51,7 @@ class Addon
 	 * @return array
 	 * @throws \Exception
 	 */
-	public static function getAvailableList()
+	public static function getAvailableList(): array
 	{
 		$addons = [];
 		$files = glob('addon/*/');
@@ -81,14 +81,10 @@ class Addon
 	 * @return array
 	 * @throws \Exception
 	 */
-	public static function getAdminList()
+	public static function getAdminList(): array
 	{
 		$addons_admin = [];
-		$addons = DI::config()->get('addons');
-
-		if (empty($addons)) {
-			return $addons_admin;
-		}
+		$addons = array_filter(DI::config()->get('addons') ?? []);
 
 		ksort($addons);
 		foreach ($addons as $name => $data) {
@@ -121,7 +117,7 @@ class Addon
 	 */
 	public static function loadAddons()
 	{
-		self::$addons = array_keys(DI::config()->get('addons') ?? []);
+		self::$addons = array_keys(array_filter(DI::config()->get('addons') ?? []));
 	}
 
 	/**
@@ -191,10 +187,12 @@ class Addon
 	 * reload all updated addons
 	 *
 	 * @return void
+	 * @throws \Exception
+	 *
 	 */
 	public static function reload()
 	{
-		$addons = DI::config()->get('addons');
+		$addons = array_filter(DI::config()->get('addons') ?? []);
 
 		foreach ($addons as $name => $data) {
 			$addonname = Strings::sanitizeFilePathItem(trim($name));
@@ -317,7 +315,8 @@ class Addon
 	public static function getVisibleList(): array
 	{
 		$visible_addons = [];
-		$addons = DI::config()->get('addons');
+		$addons = array_filter(DI::config()->get('addons') ?? []);
+
 		foreach ($addons as $name => $data) {
 			$visible_addons[] = $name;
 		}