Merge pull request #2981 from nextcloud/fix/subscription

Fix subscriptions
nextcloud · Jul 8, 2023 · 23a9567 · 23a9567
2 parents 0a8c745 + b7dcd3c
commit 23a9567
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@ All notable changes to this project will be documented in this file.
 ### Fixes
  - Fix date shifting and sequence problems with daylight saving times
  - Bring back notifications
+ - fix notification subscription
 ## [5.1.0] - 2023-06-27
 ### Changes
  - Added user option to remove outdated polls from th "Relevant" list

diff --git a/lib/Service/SubscriptionService.php b/lib/Service/SubscriptionService.php
@@ -57,8 +57,9 @@ public function set(bool $subscribed, Acl $acl): bool {
 			} catch (Exception $e) {
 				if ($e->getReason() === Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
 					// catch silently (assume already subscribed)
+				} else {
+					throw $e;
 				}
-				throw $e;
 			}
 		}
 		return $subscribed;