summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2020-08-12 16:46:00 +0200
committerGitHub <noreply@github.com>2020-08-12 16:46:00 +0200
commit6ca359a7452a4cfd9a7b818e84b9e03144f081bb (patch)
tree47edfd772506fc50dc83de6daa29ec4a444362e8
parent55e79b8a6afabce230175be382216cedc9dec741 (diff)
parent53fab3fe5fbf81c3f011d79c19347d87839b7c1c (diff)
downloadnextcloud-server-6ca359a7452a4cfd9a7b818e84b9e03144f081bb.tar.gz
nextcloud-server-6ca359a7452a4cfd9a7b818e84b9e03144f081bb.zip
Merge pull request #22217 from nextcloud/enh/noid/disable-admin-changed-email-appconfig
Add app config option to disable "Email was changed by admin" email
-rw-r--r--apps/settings/lib/Hooks.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/apps/settings/lib/Hooks.php b/apps/settings/lib/Hooks.php
index b701934b084..78f7e28ed1c 100644
--- a/apps/settings/lib/Hooks.php
+++ b/apps/settings/lib/Hooks.php
@@ -182,6 +182,9 @@ class Hooks {
$event->setAuthor($actor->getUID())
->setSubject($subject);
} else {
+ if ($this->config->getAppValue('settings', 'disable_email.email_address_changed_by_admin', 'no') === 'yes') {
+ return;
+ }
$text = $l->t('Your email address on %s was changed by an administrator.', [$instanceUrl]);
$event->setSubject(Provider::EMAIL_CHANGED);
}