Merge branch 'xorg/maint' into xorg/master

diff --git a/modules/register.php b/modules/register.php
index bc54a13..48d37a8 100644 (file)
--- a/modules/register.php
+++ b/modules/register.php
@@ -373,6 +373,7 @@ class RegisterModule extends PLModule
         $user = User::getSilentWithUID($uid);
         $redirect = new Redirect($user);
         $redirect->add_email($email);
+        fix_bestalias($user);
 
         // Try to start a session (so the user don't have to log in); we will use
         // the password available in Post:: to authenticate the user.