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

This commit is contained in:
Mario Vavti
2017-10-20 10:08:57 +02:00
8 changed files with 170 additions and 52 deletions

View File

@@ -123,6 +123,9 @@ class Register extends \Zotlabs\Web\Controller {
if($policy == REGISTER_OPEN ) {
if($email_verify) {
$res = verify_email_address($result);
if($res) {
info( t('Registration successful. Please check your email for validation instructions.') . EOL ) ;
}
}
else {
$res = send_register_success_email($result['email'],$result['password']);
@@ -171,7 +174,8 @@ class Register extends \Zotlabs\Web\Controller {
$next_page = $x;
$_SESSION['workflow'] = true;
}
unset($_SESSION['login_return_url']);
goaway(z_root() . '/' . $next_page);
}