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-17 09:23:02 +0000 |
| commit | 3ee3542bdfc192ec8e3fcc3d4861b6d3142e9ef1 (patch) | |
| tree | dcecb3e5a8bbf0fb1c266f3dbf5e44c9855a5c9a /lib | |
| parent | 9da1675c9e715c117b134a3fcec8e352c30ef33e (diff) | |
| download | nextcloud-server-3ee3542bdfc192ec8e3fcc3d4861b6d3142e9ef1.tar.gz nextcloud-server-3ee3542bdfc192ec8e3fcc3d4861b6d3142e9ef1.zip | |
fix(appstoreFetcher): get app list from custom app storebackport/48114/stable30
Signed-off-by: Grigorii K. Shartsev <me@shgk.me>
Diffstat (limited to 'lib')
| -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 30053034b80..e7ab2f9c377 100644 --- a/lib/private/App/AppStore/Fetcher/AppFetcher.php +++ b/lib/private/App/AppStore/Fetcher/AppFetcher.php @@ -152,14 +152,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 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 []; } |