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

get email for code

Browse Source
This commit is contained in:
Evan Prodromou
2011-04-17 19:28:22 -04:00
parent 6a329f4397
commit a564af4948
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/EmailRegistration/emailregister.php
View File

@@ -236,11 +236,17 @@ class EmailregisterAction extends Action
function confirmRegistration() function confirmRegistration()
{ {
$nickname = $this->nicknameFromEmail($this->email); if (!empty($this->invitation)) {
$email = $this->invitation->address;
} else if (!empty($this->confirmation)) {
$email = $this->confirmation->address;
}
$nickname = $this->nicknameFromEmail($email);
$this->form = new ConfirmRegistrationForm($this, $this->form = new ConfirmRegistrationForm($this,
$nickname, $nickname,
$this->email, $email,
$this->invitation->code); $this->invitation->code);
$this->showPage(); $this->showPage();
} }
@@ -356,7 +362,7 @@ class EmailregisterAction extends Action
$nickname = preg_replace('/[^A-Za-z0-9]/', '', $str); $nickname = preg_replace('/[^A-Za-z0-9]/', '', $str);
$nickname = Nickname::normalize($parts[0]); $nickname = Nickname::normalize($nickname);
$original = $nickname; $original = $nickname;