X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Femails.combobox.inc.php;h=db6979b69f151af49257c5d5509d0631e6adebf4;hb=5aed580a3a092b460ecfa5ea398c822b9aa904da;hp=3d9a09f7dbba58ddecda2a2565f26a644659d1c1;hpb=ce0b2c6f3fc4e7c524df32f56f1bc8e8d573bb1a;p=platal.git

diff --git a/include/emails.combobox.inc.php b/include/emails.combobox.inc.php
index 3d9a09f..db6979b 100644
--- a/include/emails.combobox.inc.php
+++ b/include/emails.combobox.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2010 Polytechnique.org                              *
+ *  Copyright (C) 2003-2011 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -23,9 +23,12 @@ function fill_email_combobox(PlPage& $page, $user = null, $profile = null)
 {
     global $globals;
 
-    if (is_null($user) && is_null($profile)) {
+    if (is_null($user)) {
         $user = S::user();
-        $profile = $user->profile();
+    }
+    if (is_null($profile)) {
+        /* Always refetch the profile. */
+        $profile = $user->profile(true);
     }
     $email_type = "directory";
 
@@ -70,7 +73,7 @@ function fill_email_combobox(PlPage& $page, $user = null, $profile = null)
         $res = XDB::query(
                 "SELECT  alias
                    FROM  aliases
-                  WHERE  id={?} AND (type='a_vie' OR type='alias')", $user->id());
+                  WHERE  uid={?} AND (type='a_vie' OR type='alias')", $user->id());
         $res = $res->fetchAllAssoc();
         $page->assign('list_email_X', $res);
         if (($domain == $globals->mail->domain) || ($domain == $globals->mail->domain2)) {