From b4d831e0e37eb7abae898781bd57b3df99c6ac9e Mon Sep 17 00:00:00 2001
From: =?utf8?q?St=C3=A9phane=20Jacob?= <sj@m4x.org>
Date: Thu, 25 Aug 2011 23:13:41 +0200
Subject: [PATCH] Fixes bestalias after updating melix alias (Closing #1533).
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Jacob <sj@m4x.org>
---
 ChangeLog                           | 1 +
 include/validations/aliases.inc.php | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 444b4c5..4236ace 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,7 @@ Bug/Wish:
 
     * Email:
         - #1517: Fixes bestalias update when two local_part are identical  -JAC
+        - #1533: Fixes bestalias after updating melix alias                -JAC
 
 From 1.1.2 branch:
 
diff --git a/include/validations/aliases.inc.php b/include/validations/aliases.inc.php
index 4dabe8d..5109fa9 100644
--- a/include/validations/aliases.inc.php
+++ b/include/validations/aliases.inc.php
@@ -99,6 +99,12 @@ class AliasReq extends Validate
                                      $this->alias, $this->user->id(), Platal::globals()->mail->alias_dom);
         }
 
+        if ($success) {
+            // Update the local User object, to pick up the new bestalias.
+            fix_bestalias($this->user);
+            $this->user = User::getSilentWithUID($this->user->id());
+        }
+
         return $success;
     }
 }
-- 
2.1.4