fix email verification status

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>

lib/private/Accounts/AccountManager.php

@@ -97,7 +97,7 @@ class AccountManager {
 		if (empty($userData)) {
 			$this->insertNewUser($user, $data);
 		} elseif ($userData !== $data) {
-			$this->checkEmailVerification($userData, $data, $user);
+			$data = $this->checkEmailVerification($userData, $data, $user);
 			$data = $this->updateVerifyStatus($userData, $data);
 			$this->updateExistingUser($user, $data);
 		} else {
@@ -147,6 +147,7 @@ class AccountManager {
 	 * @param $oldData
 	 * @param $newData
 	 * @param IUser $user
+	 * @return array
 	 */
 	protected function checkEmailVerification($oldData, $newData, IUser $user) {
 		if ($oldData[self::PROPERTY_EMAIL]['value'] !== $newData[self::PROPERTY_EMAIL]['value']) {
@@ -160,7 +161,10 @@ class AccountManager {
 					'lastRun' => time()
 				]
 			);
+			$newData[AccountManager::PROPERTY_EMAIL]['verified'] = AccountManager::VERIFICATION_IN_PROGRESS;
 		}
+
+		return $newData;
 	}
 
 	/**

tests/lib/Accounts/AccountsManagerTest.php

@@ -95,7 +95,7 @@ class AccountsManagerTest extends TestCase {
 
 		if ($updateExisting) {
 			$accountManager->expects($this->once())->method('checkEmailVerification')
-				->with($oldData, $newData, $user);
+				->with($oldData, $newData, $user)->willReturn($newData);
 			$accountManager->expects($this->once())->method('updateVerifyStatus')
 				->with($oldData, $newData)->willReturn($newData);
 			$accountManager->expects($this->once())->method('updateExistingUser')