Merge pull request #34135 from nextcloud/fix/noid/disable_activity.em…

…ail_address_changed_by_admin Fix "email changed" activity email check
nextcloud · Oct 14, 2022 · a8101ec · a8101ec
2 parents eb911d3 + 08a7731
commit a8101ec
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/apps/settings/lib/Hooks.php b/apps/settings/lib/Hooks.php
@@ -178,12 +178,17 @@ public function onChangeEmail(IUser $user, $oldMailAddress) {
 		if ($actor instanceof IUser) {
 			$subject = Provider::EMAIL_CHANGED_SELF;
 			if ($actor->getUID() !== $user->getUID()) {
+				// set via the OCS API
+				if ($this->config->getAppValue('settings', 'disable_activity.email_address_changed_by_admin', 'no') === 'yes') {
+					return;
+				}
 				$subject = Provider::EMAIL_CHANGED;
 			}
 			$text = $l->t('Your email address on %s was changed.', [$instanceUrl]);
 			$event->setAuthor($actor->getUID())
 				->setSubject($subject);
 		} else {
+			// set with occ
 			if ($this->config->getAppValue('settings', 'disable_activity.email_address_changed_by_admin', 'no') === 'yes') {
 				return;
 			}