diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-02-24 17:44:27 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-02-24 17:44:27 +0100 |
| commit | ddeab48f9b314eed067c31086945acee33964d37 (patch) | |
| tree | a814d6244991017af57ea03670d45d9ca1286cc0 /include/account.php | |
| parent | cc264b2d60049a844fe17322fbcb367712a7071f (diff) | |
| parent | 039eb585240a5fa106ede00a055036458a4f5393 (diff) | |
| download | volse-hubzilla-ddeab48f9b314eed067c31086945acee33964d37.tar.gz volse-hubzilla-ddeab48f9b314eed067c31086945acee33964d37.tar.bz2 volse-hubzilla-ddeab48f9b314eed067c31086945acee33964d37.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/account.php')
| -rw-r--r-- | include/account.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/account.php b/include/account.php index dae0f4895..4c828003e 100644 --- a/include/account.php +++ b/include/account.php @@ -407,7 +407,7 @@ function account_allow($hash) { pop_lang(); - if(get_config('system','auto_channel_create')) + if(get_config('system','auto_channel_create') || UNO) auto_channel_create($register[0]['uid']); if ($res) { @@ -500,7 +500,7 @@ function account_approve($hash) { ); - if(get_config('system','auto_channel_create')) + if(get_config('system','auto_channel_create') || UNO) auto_channel_create($register[0]['uid']); info( t('Account verified. Please login.') . EOL ); |