Commit c7511094 authored by Evan Prodromou's avatar Evan Prodromou

Merge branch '1.0.x' into testing

parents 67690b44 c4aef15a
......@@ -262,7 +262,6 @@ class EmailregisterAction extends Action
if (!$this->tos) {
// 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.');
return;
} else if (empty($this->password1)) {
// TRANS: Error text when trying to register without a password.
$this->error = _m('You must set a password');
......@@ -276,7 +275,7 @@ class EmailregisterAction extends Action
if (!empty($this->error)) {
$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();
return;
}
......@@ -291,7 +290,7 @@ class EmailregisterAction extends Action
} catch (ClientException $e) {
$this->error = $e->getMessage();
$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();
return;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment