diff options
| author | Andy Scherzinger <info@andy-scherzinger.de> | 2024-09-23 21:11:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-23 21:11:04 +0200 |
| commit | d306a006af1be635eeb6b395d50263f7e3022fee (patch) | |
| tree | 99b8eb07da3ad3916b0006c5d13dcb8c63e005f5 | |
| parent | 2fef8615f649fe8a8c4ee52ae87c0129a9aa97db (diff) | |
| parent | 23e8424c1901231cd4d194fdf92df92a3675144c (diff) | |
| download | nextcloud-server-d306a006af1be635eeb6b395d50263f7e3022fee.tar.gz nextcloud-server-d306a006af1be635eeb6b395d50263f7e3022fee.zip | |
Merge pull request #48165 from nextcloud/backport/48114/stable29
[stable29] fix(appstoreFetcher): get list from a custom store and remove unnecessary warning
| -rw-r--r-- | lib/private/App/AppStore/Fetcher/AppFetcher.php | 9 | ||||
| -rw-r--r-- | lib/private/App/AppStore/Fetcher/Fetcher.php | 1 |
2 files changed, 1 insertions, 9 deletions
diff --git a/lib/private/App/AppStore/Fetcher/AppFetcher.php b/lib/private/App/AppStore/Fetcher/AppFetcher.php index 2148d892283..d23c3e7dc04 100644 --- a/lib/private/App/AppStore/Fetcher/AppFetcher.php +++ b/lib/private/App/AppStore/Fetcher/AppFetcher.php @@ -176,17 +176,8 @@ class AppFetcher extends Fetcher { public function get($allowUnstable = false): array { $allowPreReleases = $allowUnstable || $this->getChannel() === 'beta' || $this->getChannel() === 'daily' || $this->getChannel() === 'git'; - $appStoreEnabled = $this->config->getSystemValueBool('appstoreenabled', true); - $internetAvailable = $this->config->getSystemValueBool('has_internet_connection', true); - - if (!$appStoreEnabled || !$internetAvailable) { - $this->logger->info('AppStore is disabled or this instance has no Internet connection', ['app' => 'appstoreFetcher']); - return []; - } - $apps = parent::get($allowPreReleases); if (empty($apps)) { - $this->logger->warning('Could not get apps from the appstore', ['app' => 'appstoreFetcher']); return []; } $allowList = $this->config->getSystemValue('appsallowlist'); diff --git a/lib/private/App/AppStore/Fetcher/Fetcher.php b/lib/private/App/AppStore/Fetcher/Fetcher.php index c6781b03b02..130e8d52e45 100644 --- a/lib/private/App/AppStore/Fetcher/Fetcher.php +++ b/lib/private/App/AppStore/Fetcher/Fetcher.php @@ -145,6 +145,7 @@ abstract class Fetcher { $isDefaultAppStore = $this->config->getSystemValueString('appstoreurl', self::APP_STORE_URL) === self::APP_STORE_URL; if (!$appstoreenabled || (!$internetavailable && $isDefaultAppStore)) { + $this->logger->info('AppStore is disabled or this instance has no Internet connection to access the default app store', ['app' => 'appstoreFetcher']); return []; } |