diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2024-09-17 10:26:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-17 10:26:31 +0200 |
| commit | 6f78730573b65842839b2bebc530275d8d62c931 (patch) | |
| tree | 10116b1687755d939a9b65b9a65e5cb4333b4dbf /lib | |
| parent | c256518ab3cb61d046ee10edf1c3b18218ee8ff6 (diff) | |
| parent | 70ed4aec39876ddabd668bb4c4ca889875503dcd (diff) | |
| download | nextcloud-server-6f78730573b65842839b2bebc530275d8d62c931.tar.gz nextcloud-server-6f78730573b65842839b2bebc530275d8d62c931.zip | |
Merge pull request #48114 from nextcloud/fix/AppStore--remove-unneeded-warning
Diffstat (limited to 'lib')
| -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 4ef0b1eb51b..e7ab2f9c377 100644 --- a/lib/private/App/AppStore/Fetcher/AppFetcher.php +++ b/lib/private/App/AppStore/Fetcher/AppFetcher.php @@ -152,17 +152,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 bc85be662df..edb96b55f0a 100644 --- a/lib/private/App/AppStore/Fetcher/Fetcher.php +++ b/lib/private/App/AppStore/Fetcher/Fetcher.php @@ -121,6 +121,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 []; } |