diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-06-28 11:09:22 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-06-28 11:09:22 +0200 |
| commit | 9f576369a97009bc93f4f724f85024410c3899df (patch) | |
| tree | adc2c68e8729ff783eca9cd259bc5b8fe394d2e6 /include/account.php | |
| parent | 911510f9996dc43bd3440884325326b7e99ea12f (diff) | |
| parent | 7d7f43c2056fd50ff26aed5df553bf4936ead196 (diff) | |
| download | volse-hubzilla-9f576369a97009bc93f4f724f85024410c3899df.tar.gz volse-hubzilla-9f576369a97009bc93f4f724f85024410c3899df.tar.bz2 volse-hubzilla-9f576369a97009bc93f4f724f85024410c3899df.zip | |
Merge branch 'dev' into sabre32
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..c02a74928 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],true,true,false,true); + } + - info( t('Account verified. Please login.') . EOL ); + // info( t('Account verified. Please login.') . EOL ); return true; } |