Merge pull request #3299 from nextcloud/bugfix/noid/calendar-setting

Return false instead of throwing when getting calendar setting
nextcloud · Sep 7, 2021 · b9758a7 · b9758a7
2 parents 643302b + 021aa69
commit b9758a7
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/lib/Service/ConfigService.php b/lib/Service/ConfigService.php
@@ -82,21 +82,18 @@ public function get($key) {
 				if ($this->getUserId() === null || !$this->groupManager->isAdmin($this->getUserId())) {
 					throw new NoPermissionException('You must be admin to get the group limit');
 				}
-				$result = $this->getGroupLimit();
-				break;
+				return $this->getGroupLimit();
 			case 'calendar':
 				if ($this->getUserId() === null) {
-					throw new NoPermissionException('Must be logged in to get the group limit');
+					return false;
 				}
-				$result = (bool)$this->config->getUserValue($this->getUserId(), Application::APP_ID, 'calendar', true);
-				break;
+				return (bool)$this->config->getUserValue($this->getUserId(), Application::APP_ID, 'calendar', true);
 		}
-		return $result;
 	}
 
 	public function isCalendarEnabled(int $boardId = null): bool {
 		if ($this->getUserId() === null) {
-			throw new NoPermissionException('Must be logged in to access user config');
+			return false;
 		}
 
 		$defaultState = (bool)$this->config->getUserValue($this->getUserId(), Application::APP_ID, 'calendar', true);