diff options
| author | Grigorii K. Shartsev <me@shgk.me> | 2024-09-17 01:29:25 +0200 |
|---|---|---|
| committer | Grigorii K. Shartsev <me@shgk.me> | 2024-09-18 13:24:01 +0200 |
| commit | 23e8424c1901231cd4d194fdf92df92a3675144c (patch) | |
| tree | d7ad9c6f89897d65ad75c80fe2a9b8078eba072a | |
| parent | 07ce8c7e84d1c457c83c0b4d820ed4784363ea5e (diff) | |
| download | nextcloud-server-23e8424c1901231cd4d194fdf92df92a3675144c.tar.gz nextcloud-server-23e8424c1901231cd4d194fdf92df92a3675144c.zip | |
fix(appstoreFetcher): get app list from custom app storebackport/48114/stable29
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 9415fbb0428..d23c3e7dc04 100644 --- a/lib/private/App/AppStore/Fetcher/AppFetcher.php +++ b/lib/private/App/AppStore/Fetcher/AppFetcher.php @@ -176,14 +176,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 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 []; } |