diff options
| author | Grigorii K. Shartsev <me@shgk.me> | 2024-09-17 01:29:25 +0200 |
|---|---|---|
| committer | backportbot[bot] <backportbot[bot]@users.noreply.github.com> | 2024-09-18 11:28:22 +0000 |
| commit | 5fa2c4a6fa5eec028c89afc7b67decbd4071bb53 (patch) | |
| tree | 280a0de6be8e477c1242fc5fbe735d805f55b029 | |
| parent | 3db00b7fa9988d6c8c11ee12466d48e1d8e86a70 (diff) | |
| download | nextcloud-server-5fa2c4a6fa5eec028c89afc7b67decbd4071bb53.tar.gz nextcloud-server-5fa2c4a6fa5eec028c89afc7b67decbd4071bb53.zip | |
fix(appstoreFetcher): get app list from custom app storebackport/48114/stable28
Signed-off-by: Grigorii K. Shartsev <me@shgk.me>
| -rw-r--r-- | lib/private/App/AppStore/Fetcher/AppFetcher.php | 8 | ||||
| -rw-r--r-- | lib/private/App/AppStore/Fetcher/Fetcher.php | 1 |
2 files changed, 1 insertions, 8 deletions
diff --git a/lib/private/App/AppStore/Fetcher/AppFetcher.php b/lib/private/App/AppStore/Fetcher/AppFetcher.php index 7f80ed360df..3915c88aefe 100644 --- a/lib/private/App/AppStore/Fetcher/AppFetcher.php +++ b/lib/private/App/AppStore/Fetcher/AppFetcher.php @@ -184,14 +184,6 @@ 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)) { return []; diff --git a/lib/private/App/AppStore/Fetcher/Fetcher.php b/lib/private/App/AppStore/Fetcher/Fetcher.php index 3633a16b266..253560052ac 100644 --- a/lib/private/App/AppStore/Fetcher/Fetcher.php +++ b/lib/private/App/AppStore/Fetcher/Fetcher.php @@ -158,6 +158,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 []; } |