check disable_activity.email_address_changed_by_admin when email is changed by admin...

Signed-off-by: Julien Veyssier <eneiluj@posteo.net>

diff --git a/apps/settings/lib/Hooks.php b/apps/settings/lib/Hooks.php
index b7b78c49b121f495acee4cd995255aad300b7cda..a5be30be53f3080b0a2f496e12fe1d9046c5a40c 100644 (file)
--- a/apps/settings/lib/Hooks.php
+++ b/apps/settings/lib/Hooks.php
@@ -178,12 +178,17 @@ class Hooks {
                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;
                        }