diff options
| author | zottel <github@zottel.net> | 2012-06-02 02:37:20 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-06-02 02:37:20 +0200 |
| commit | df2fdf08ddf8cb354022992d4353ced4295b77b3 (patch) | |
| tree | 1f850dfb657ddf52a4bf7fe036f81a1d911cfb64 /include | |
| parent | 08b335cac0a881b8f19793aaaebc6dacef445643 (diff) | |
| parent | 0165d5dd2c8b12a71395cc881910974ddcbaf3fa (diff) | |
| download | volse-hubzilla-df2fdf08ddf8cb354022992d4353ced4295b77b3.tar.gz volse-hubzilla-df2fdf08ddf8cb354022992d4353ced4295b77b3.tar.bz2 volse-hubzilla-df2fdf08ddf8cb354022992d4353ced4295b77b3.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'include')
| -rw-r--r-- | include/user.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/user.php b/include/user.php index 75a91b096..af43a2b52 100644 --- a/include/user.php +++ b/include/user.php @@ -24,9 +24,11 @@ function create_user($arr) { $email = ((x($arr,'email')) ? notags(trim($arr['email'])) : ''); $openid_url = ((x($arr,'openid_url')) ? notags(trim($arr['openid_url'])) : ''); $photo = ((x($arr,'photo')) ? notags(trim($arr['photo'])) : ''); - $publish = ((x($arr,'profile_publish_reg') && intval($arr['profile_publish_reg'])) ? 1 : 0); $password = ((x($arr,'password')) ? trim($arr['password']) : ''); + $blocked = ((x($arr,'blocked')) ? intval($arr['blocked']) : 0); + $verified = ((x($arr,'verified')) ? intval($arr['verified']) : 0); + $publish = ((x($arr,'profile_publish_reg') && intval($arr['profile_publish_reg'])) ? 1 : 0); $netpublish = ((strlen(get_config('system','directory_submit_url'))) ? $publish : 0); $tmp_str = $openid_url; |