X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FEmailRegistration%2Factions%2Femailregister.php;h=44c60e2cf2bddb2ef2676e69a1c08135ed0426a8;hb=d6b28c64830f632bb2f4b6f3c9369b9e56ad217a;hp=3ad9c63f13ee814fc0ce3fd72105be94c25b909e;hpb=5e47b1b2a07d8b300c511115ca018ece172a8505;p=quix0rs-gnu-social.git

diff --git a/plugins/EmailRegistration/actions/emailregister.php b/plugins/EmailRegistration/actions/emailregister.php
index 3ad9c63f13..44c60e2cf2 100644
--- a/plugins/EmailRegistration/actions/emailregister.php
+++ b/plugins/EmailRegistration/actions/emailregister.php
@@ -124,6 +124,7 @@ class EmailregisterAction extends Action
                     }
                 }
 
+                $this->nickname = Nickname::normalize($this->trimmed('nickname'));
                 $this->password1 = $this->trimmed('password1');
                 $this->password2 = $this->trimmed('password2');
 
@@ -285,16 +286,13 @@ class EmailregisterAction extends Action
             }
 
             if (!empty($this->error)) {
-                $nickname = $this->nicknameFromEmail($email);
-                $this->form = new ConfirmRegistrationForm($this, $nickname, $email, $this->code);
+                $this->form = new ConfirmRegistrationForm($this, $this->nickname, $email, $this->code);
                 $this->showPage();
                 return;
             }
 
-            $nickname = $this->nicknameFromEmail($email);
-
             try {
-                $fields = array('nickname' => $nickname,
+                $fields = array('nickname' => $this->nickname,
                                 'email' => $email,
                                 'password' => $this->password1,
                                 'email_confirmed' => true);
@@ -305,8 +303,7 @@ class EmailregisterAction extends Action
                 $this->user = User::register($fields);
             } catch (ClientException $e) {
                 $this->error = $e->getMessage();
-                $nickname = $this->nicknameFromEmail($email);
-                $this->form = new ConfirmRegistrationForm($this, $nickname, $email, $this->code);
+                $this->form = new ConfirmRegistrationForm($this, $this->nickname, $email, $this->code);
                 $this->showPage();
                 return;
             }