<?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 *
{
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";
$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)) {