Now logging in with Red zaccount/zentity instead of Friendica user. Yay. Most existing Friendica functionality is now stuffed since the Red structures are quite different.

1 files changed, 10 insertions, 3 deletions

diff --git a/mod/zregister.php b/mod/zregister.php
index a9a622213..478921c3f 100644
--- a/mod/zregister.php
+++ b/mod/zregister.php
@@ -75,7 +75,6 @@ function zregister_post(&$a) {
 	}
 	require_once('include/security.php');
 
-	authenticate_success($result['account'],true,true);
 
  	$using_invites = intval(get_config('system','invitation_only'));
 	$num_invites   = intval(get_config('system','number_invites'));
@@ -90,7 +89,6 @@ function zregister_post(&$a) {
 		$res = send_verification_email($result['email'],$result['password']);
 		if($res) {
 			info( t('Registration successful. Please check your email for validation instructions.') . EOL ) ;
-			goaway(z_root());
 		}
 	}
 	elseif($policy == REGISTER_APPROVE) {
@@ -103,7 +101,16 @@ function zregister_post(&$a) {
 		}
 		goaway(z_root());
 	}
-	return;
+
+	authenticate_success($result['account'],true,false,true);
+
+	if(! strlen($next_page = get_config('system','workflow_register_next')))
+		$next_page = 'zentity';
+
+	$_SESSION['workflow'] = true;
+	
+	goaway(z_root() . '/' . $next_page);
+
 }