From 7e714ae971775f3f4d9d4b3b92a930ca1c4b2275 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 22 Jun 2017 09:02:12 +0200 Subject: [PATCH] Don't create activities for email and password change before login Signed-off-by: Joas Schilling --- settings/Hooks.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/settings/Hooks.php b/settings/Hooks.php index daf3a40cf1b23..2cc5ce30bbe71 100644 --- a/settings/Hooks.php +++ b/settings/Hooks.php @@ -78,7 +78,8 @@ public function __construct(IActivityManager $activityManager, public function onChangePassword($uid) { $user = $this->userManager->get($uid); - if (!$user instanceof IUser || $user->getEMailAddress() === null) { + if (!$user instanceof IUser || $user->getLastLogin() === 0) { + // User didn't login, so don't create activities and emails. return; } @@ -141,8 +142,10 @@ public function onChangePassword($uid) { */ public function onChangeEmail(IUser $user, $oldMailAddress) { - if ($oldMailAddress === $user->getEMailAddress()) { - // Email didn't really change, so don't create activities and emails + if ($oldMailAddress === $user->getEMailAddress() || + $user->getLastLogin() === 0) { + // Email didn't really change or user didn't login, + // so don't create activities and emails. return; }