bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge pull request #12628 from nupplaphil/bug/typeerror

Browse source 
Don't ksort() or loop without an addon array
This commit is contained in:
Hypolite Petovan 2023-01-07 15:06:28 -05:00 committed by GitHub
parent f37edc06e1 6aaf1ea5d4
commit 5fd3d4bda3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/Core/Addon.php
View file

@ -51,7 +51,7 @@ class Addon
* @return array * @return array
* @throws \Exception * @throws \Exception
*/ */
public static function getAvailableList() public static function getAvailableList(): array
{ {
$addons = []; $addons = [];
$files = glob('addon/*/'); $files = glob('addon/*/');
@ -81,10 +81,11 @@ class Addon
* @return array * @return array
* @throws \Exception * @throws \Exception
*/ */
public static function getAdminList() public static function getAdminList(): array
{ {
$addons_admin = []; $addons_admin = [];
$addons = DI::config()->get('addons'); $addons = DI::config()->get('addons') ?? [];
ksort($addons); ksort($addons);
foreach ($addons as $name => $data) { foreach ($addons as $name => $data) {
if (empty($data['admin'])) { if (empty($data['admin'])) {
@ -186,10 +187,12 @@ class Addon
* reload all updated addons * reload all updated addons
* *
* @return void * @return void
* @throws \Exception
*
*/ */
public static function reload() public static function reload()
{ {
$addons = DI::config()->get('addons'); $addons = DI::config()->get('addons') ?? [];
foreach ($addons as $name => $data) { foreach ($addons as $name => $data) {
$addonname = Strings::sanitizeFilePathItem(trim($name)); $addonname = Strings::sanitizeFilePathItem(trim($name));
@ -312,7 +315,8 @@ class Addon
public static function getVisibleList(): array public static function getVisibleList(): array
{ {
$visible_addons = []; $visible_addons = [];
$addons = DI::config()->get('addons'); $addons = DI::config()->get('addons') ?? [];
foreach ($addons as $name => $data) { foreach ($addons as $name => $data) {
$visible_addons[] = $name; $visible_addons[] = $name;
} }