D7621.diff
All Users
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D7621.diff
View Options

	diff --git a/src/applications/auth/controller/PhabricatorEmailVerificationController.php b/src/applications/auth/controller/PhabricatorEmailVerificationController.php
	--- a/src/applications/auth/controller/PhabricatorEmailVerificationController.php
	+++ b/src/applications/auth/controller/PhabricatorEmailVerificationController.php
	@@ -44,7 +44,7 @@
	'user. Make sure you followed the link in the email correctly and are '.
	'logged in with the user account associated with the email address.');
	$continue = pht('Rats!');
	- } else if ($email->getIsVerified()) {
	+ } else if ($email->getIsVerified() && $user->getIsEmailVerified()) {
	$title = pht('Address Already Verified');
	$content = pht(
	'This email address has already been verified.');
	diff --git a/src/applications/auth/controller/PhabricatorMustVerifyEmailController.php b/src/applications/auth/controller/PhabricatorMustVerifyEmailController.php
	--- a/src/applications/auth/controller/PhabricatorMustVerifyEmailController.php
	+++ b/src/applications/auth/controller/PhabricatorMustVerifyEmailController.php
	@@ -19,7 +19,7 @@

	$email = $user->loadPrimaryEmail();

	- if ($email->getIsVerified()) {
	+ if ($user->getIsEmailVerified()) {
	return id(new AphrontRedirectResponse())->setURI('/');
	}