X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fvcard.inc.php;h=b62d09f43a33e1bd44d18f579a849d687ecb3bcb;hb=2700a4f5b414f91183460b2dbba33624b5bfd9b7;hp=d16dae6e8762f5bdc32b10d742ce381204e9e59d;hpb=21c7c593d7100a887f984c49a82c03eb32169fc4;p=platal.git diff --git a/include/vcard.inc.php b/include/vcard.inc.php index d16dae6..b62d09f 100644 --- a/include/vcard.inc.php +++ b/include/vcard.inc.php @@ -83,6 +83,7 @@ class VCard extends PlVCard } // Emails + // TODO: this logic is not hruid-compatible; replace it. $entry->addMail(null, $user['bestalias'] . '@' . $globals->mail->domain, true); $entry->addMail(null, $user['bestalias'] . '@' . $globals->mail->domain2); if ($user['bestalias'] != $user['forlife']) { @@ -162,7 +163,7 @@ class VCard extends PlVCard $res = XDB::query( "SELECT attach, attachmime FROM photo AS p - WHERE u.user_id = {?}", $login->id()); + WHERE p.uid = {?}", $login->id()); if ($res->numRows()) { list($data, $type) = $res->fetchOneRow(); $entry->setPhoto($data, strtoupper($type));