diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-02-18 20:33:25 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-02-18 20:33:25 +0100 |
| commit | cc264b2d60049a844fe17322fbcb367712a7071f (patch) | |
| tree | f1f069a49dd186d4cf21c37a25fb794d6d53e6f2 /mod/register.php | |
| parent | b77c5ae61e5a208daf4b9431a730db874c487e32 (diff) | |
| parent | 33c34984e647f48452d53b93b635f6f517a0f392 (diff) | |
| download | volse-hubzilla-cc264b2d60049a844fe17322fbcb367712a7071f.tar.gz volse-hubzilla-cc264b2d60049a844fe17322fbcb367712a7071f.tar.bz2 volse-hubzilla-cc264b2d60049a844fe17322fbcb367712a7071f.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mod/register.php')
| -rw-r--r-- | mod/register.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/mod/register.php b/mod/register.php index 49b010cc7..77ddfb4b1 100644 --- a/mod/register.php +++ b/mod/register.php @@ -145,6 +145,7 @@ function register_post(&$a) { authenticate_success($result['account'],true,false,true); $new_channel = false; + $next_page = 'new_channel'; if(get_config('system','auto_channel_create') || UNO) { $new_channel = auto_channel_create($result['account']['account_id']); @@ -156,10 +157,10 @@ function register_post(&$a) { else $new_channel = false; } - if(! $new_channel) { - if(! strlen($next_page = get_config('system','workflow_register_next'))) - $next_page = 'new_channel'; + $x = get_config('system','workflow_register_next'); + if($x) { + $next_page = $x; $_SESSION['workflow'] = true; } @@ -243,9 +244,10 @@ function register_content(&$a) { '$label_invite' => t('Please enter your invitation code'), '$invite_code' => $invite_code, '$auto_create' => $auto_create, - '$label_name' => t('Channel Name'), + '$label_name' => t('Name'), '$help_name' => t('Enter your name'), '$label_nick' => t('Choose a short nickname'), + '$nick_hub' => '@' . str_replace(array('http://','https://','/'), '', get_config('system','baseurl')), '$nick_desc' => t('Your nickname will be used to create an easily remembered channel address (like an email address) which you can share with others.'), '$name' => $name, '$help_role' => t('Please choose a channel type (such as social networking or community forum) and privacy requirements so we can select the best permissions for you'), |