Merge branch 'xorg/maint' into xorg/master

diff --git a/include/validations/aliases.inc.php b/include/validations/aliases.inc.php
index 5109fa9..259939f 100644 (file)
--- a/include/validations/aliases.inc.php
+++ b/include/validations/aliases.inc.php
@@ -101,6 +101,7 @@ class AliasReq extends Validate
 
         if ($success) {
             // Update the local User object, to pick up the new bestalias.
+            require_once 'emails.inc.php';
             fix_bestalias($this->user);
             $this->user = User::getSilentWithUID($this->user->id());
         }