From dc3c4a06d7e80cab6911d935df5b6f7f029f39de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Mon, 7 Jun 2021 13:44:57 +0200 Subject: Fix circles version comparison if circles is not installed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- lib/Controller/PageController.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php index c789ecc7..d54d519d 100644 --- a/lib/Controller/PageController.php +++ b/lib/Controller/PageController.php @@ -101,9 +101,11 @@ class PageController extends Controller { // automated background syncs for social avatars (default: no) $bgSyncEnabledByUser = $this->config->getUserValue($userId, Application::APP_ID, 'enableSocialSync', 'no'); + $circleVersion = $this->appManager->getAppVersion('circles'); $isContactsInteractionEnabled = $this->appManager->isEnabledForUser('contactsinteraction') === true; $isCirclesEnabled = $this->appManager->isEnabledForUser('circles') === true; - $isCircleVersionCompatible = $this->compareVersion->isCompatible($this->appManager->getAppVersion('circles'), 22); + // if circles is not installed, we use 0.0.0 + $isCircleVersionCompatible = $this->compareVersion->isCompatible($circleVersion ? $circleVersion : '0.0.0', 22); $this->initialStateService->provideInitialState(Application::APP_ID, 'locales', $locales); $this->initialStateService->provideInitialState(Application::APP_ID, 'defaultProfile', $defaultProfile); -- cgit v1.2.3