diff options
| author | redmatrix <git@macgirvin.com> | 2016-07-28 19:58:05 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-07-28 19:58:05 -0700 |
| commit | ae5c10a71cd29722f63b379b62801dea52a9ab8f (patch) | |
| tree | 5c9c0c6668369f5ffbd4f5c7b635c9c1ec96b996 /include/account.php | |
| parent | 2d4b75428a87038b9a637bf49fc0a91c91b392fb (diff) | |
| parent | 4d5202353fbce12f19fbe578205259d2a7bd3f04 (diff) | |
| download | volse-hubzilla-1.10.tar.gz volse-hubzilla-1.10.tar.bz2 volse-hubzilla-1.10.zip | |
Merge branch '1.10RC'1.10
Diffstat (limited to 'include/account.php')
| -rw-r--r-- | include/account.php | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/include/account.php b/include/account.php index caf12878e..142ad1bea 100644 --- a/include/account.php +++ b/include/account.php @@ -499,11 +499,27 @@ function account_approve($hash) { intval($register[0]['uid']) ); + // get a fresh copy after we've modified it. + + $account = q("SELECT * FROM account WHERE account_id = %d LIMIT 1", + intval($register[0]['uid']) + ); + + if(! $account) + return $ret; + + + if(get_config('system','auto_channel_create') || UNO) auto_channel_create($register[0]['uid']); + else { + $_SESSION['login_return_url'] = 'new_channel'; + authenticate_success($account[0],null,true,true,false,true); + } + - info( t('Account verified. Please login.') . EOL ); + // info( t('Account verified. Please login.') . EOL ); return true; } |