Merge pull request #413 from nextcloud/backport/396/stable16

[stable16] Better 'creation_activity' option handling

Author: ArtificialOwl

lib/Service/EventsService.php

@@ -107,21 +107,22 @@ public function __construct(
 	 * @param Circle $circle
 	 */
 	public function onCircleCreation(Circle $circle) {
-		if ($this->configService->getAppValue(ConfigService::CIRCLES_ACTIVITY_ON_CREATION) !== '1'
-			|| ($circle->getType() !== Circle::CIRCLES_PUBLIC
-				&& $circle->getType() !== Circle::CIRCLES_CLOSED)) {
+		if ($circle->getType() !== Circle::CIRCLES_PUBLIC
+				&& $circle->getType() !== Circle::CIRCLES_CLOSED) {
 			return;
 		}
 
-		$event = $this->generateEvent('circles_as_non_member');
-		$event->setSubject('circle_create', ['circle' => json_encode($circle)]);
+		if ($this->configService->getAppValue(ConfigService::CIRCLES_ACTIVITY_ON_CREATION) === '1') {
+			$event = $this->generateEvent('circles_as_non_member');
+			$event->setSubject('circle_create', ['circle' => json_encode($circle)]);
 
-		$this->userManager->callForSeenUsers(
-			function($user) use ($event) {
-				/** @var IUser $user */
-				$this->publishEvent($event, [$user]);
-			}
-		);
+			$this->userManager->callForSeenUsers(
+				function($user) use ($event) {
+					/** @var IUser $user */
+					$this->publishEvent($event, [$user]);
+				}
+			);
+		}
 
 		$this->dispatch('\OCA\Circles::onCircleCreation',  ['circle' => $circle]);
 	}