GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

fix notice in register

Browse Source
This commit is contained in:
Evan Prodromou 2009-02-26 13:36:10 -08:00
parent 34a61b40f4
commit 2bf5b23016
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
actions/register.php
View File

@ -131,11 +131,13 @@ class RegisterAction extends Action
$code = $this->trimmed('code'); $code = $this->trimmed('code');
$invite = null;
if ($code) { if ($code) {
$invite = Invitation::staticGet($code); $invite = Invitation::staticGet($code);
} }
if (common_config('site', 'inviteonly') && !($code && $invite)) { if (common_config('site', 'inviteonly') && !($code && !empty($invite))) {
$this->clientError(_('Sorry, only invited people can register.')); $this->clientError(_('Sorry, only invited people can register.'));
return; return;
} }
@ -341,6 +343,8 @@ class RegisterAction extends Action
{ {
$code = $this->trimmed('code'); $code = $this->trimmed('code');
$invite = null;
if ($code) { if ($code) {
$invite = Invitation::staticGet($code); $invite = Invitation::staticGet($code);
} }
@ -377,7 +381,7 @@ class RegisterAction extends Action
_('Same as password above. Required.')); _('Same as password above. Required.'));
$this->elementEnd('li'); $this->elementEnd('li');
$this->elementStart('li'); $this->elementStart('li');
if ($invite && $invite->address_type == 'email') { if (!empty($invite) && $invite->address_type == 'email') {
$this->input('email', _('Email'), $invite->address, $this->input('email', _('Email'), $invite->address,
_('Used only for updates, announcements, '. _('Used only for updates, announcements, '.
'and password recovery')); 'and password recovery'));