wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '1.0.x' into testing

Browse Source
This commit is contained in:
Evan Prodromou 2011-05-04 18:45:23 -07:00
commit c7511094db
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/EmailRegistration/emailregister.php
View File

@ -262,7 +262,6 @@ class EmailregisterAction extends Action
if (!$this->tos) { if (!$this->tos) {
// TRANS: Error text when trying to register without agreeing to the terms. // TRANS: Error text when trying to register without agreeing to the terms.
$this->error = _m('You must accept the terms of service and privacy policy to register.'); $this->error = _m('You must accept the terms of service and privacy policy to register.');
return;
} else if (empty($this->password1)) { } else if (empty($this->password1)) {
// TRANS: Error text when trying to register without a password. // TRANS: Error text when trying to register without a password.
$this->error = _m('You must set a password'); $this->error = _m('You must set a password');
@ -276,7 +275,7 @@ class EmailregisterAction extends Action
if (!empty($this->error)) { if (!empty($this->error)) {
$nickname = $this->nicknameFromEmail($email); $nickname = $this->nicknameFromEmail($email);
$this->form = new ConfirmRegistrationForm($this, $nickname, $this->email, $this->code); $this->form = new ConfirmRegistrationForm($this, $nickname, $email, $this->code);
$this->showPage(); $this->showPage();
return; return;
} }
@ -291,7 +290,7 @@ class EmailregisterAction extends Action
} catch (ClientException $e) { } catch (ClientException $e) {
$this->error = $e->getMessage(); $this->error = $e->getMessage();
$nickname = $this->nicknameFromEmail($email); $nickname = $this->nicknameFromEmail($email);
$this->form = new ConfirmRegistrationForm($this, $nickname, $this->email, $this->code); $this->form = new ConfirmRegistrationForm($this, $nickname, $email, $this->code);
$this->showPage(); $this->showPage();
return; return;
} }