diff --git a/php/src/Data/ConfigurationManager.php b/php/src/Data/ConfigurationManager.php index aa757dd5..bb33515b 100644 --- a/php/src/Data/ConfigurationManager.php +++ b/php/src/Data/ConfigurationManager.php @@ -102,7 +102,8 @@ class ConfigurationManager } public bool $isEuroofficeEnabled { - get => $this->get('isEuroofficeEnabled', true); + // Only enabled if no other office suite is enabled. + get => !$this->isOtherOfficeThanEuroOfficeEnabled() && $this->get('isEuroofficeEnabled', true); set { $this->set('isEuroofficeEnabled', $value); } } @@ -531,6 +532,12 @@ class ConfigurationManager return ''; } + // Helper function for EuroOffice to make sure that it does not + // get enabled on existing instances after updating the default + private function isOtherOfficeThanEuroOfficeEnabled() : bool { + return $this->isCollaboraEnabled || $this->isOnlyofficeEnabled; + } + private function isx64Platform() : bool { if (php_uname('m') === 'x86_64') { return true;