fix workflow for form based email validation when auto_channel_create is in effect. Eventually we will need to rework the workflow logic because it is getting a bit tangled.

1 files changed, 9 insertions, 0 deletions

diff --git a/Zotlabs/Module/Email_validation.php b/Zotlabs/Module/Email_validation.php
index 162501140..b8bb720cd 100644
--- a/Zotlabs/Module/Email_validation.php
+++ b/Zotlabs/Module/Email_validation.php
@@ -8,9 +8,18 @@ class Email_validation extends \Zotlabs\Web\Controller {
 	function post() {
 
 		if($_POST['token']) {
+			// This will redirect internally on success unless the channel is auto_created
 			if(! account_approve(trim(basename($_POST['token'])))) {
 				notice('Token verification failed.');
 			}
+			else {
+				if(get_config('system','auto_channel_create')) {
+					$next_page = get_config('system', 'workflow_channel_next', 'profiles');		
+				}
+				if($next_page) {
+					goaway(z_root() . '/' . $next_page);
+				}
+			}
 		}
 
 	}