Merge remote-tracking branch 'mike/master' into dev

2018-01-28 00:18:29 +01:00
parent 6c4054c20b 69099a2732
commit 423274b923
3 changed files with 23 additions and 5 deletions
--- a/Zotlabs/Module/Email_resend.php
+++ b/Zotlabs/Module/Email_resend.php
@@ -7,8 +7,6 @@ class Email_resend extends \Zotlabs\Web\Controller {

 	function post() {

-
-
 		if($_POST['token']) {
 			if(! account_approve(trim($_POST['token']))) {
 				notice(t('Token verification failed.'));
@@ -35,7 +33,7 @@ class Email_resend extends \Zotlabs\Web\Controller {
 				notice(t('Unable to resend email verification message.'));
 			}

-			return;
+			goaway(z_root() . '/email_validation/' . bin2hex($email));

 		}