Merge commit 'origin/master' into hruid

[platal.git] / include / vcard.inc.php

diff --git a/include/vcard.inc.php b/include/vcard.inc.php
index 2be89de..d16dae6 100644 (file)
--- a/include/vcard.inc.php
+++ b/include/vcard.inc.php
@@ -37,9 +37,9 @@ class VCard extends PlVCard
 
     public function addUser($user)
     {
-        $forlife = get_user_forlife($user, '_silent_user_callback');
-        if ($forlife) {
-            $this->user_list[] = get_user_forlife($user);
+        $user = User::getSilent($user);
+        if ($user) {
+            $this->user_list[] = $user;
             $this->count++;
         }
     }
@@ -59,7 +59,7 @@ class VCard extends PlVCard
     {
         global $globals;
         $login = $entry['value'];
-        $user  = get_user_details($login);
+        $user  = get_user_details($login->login());
 
         if (empty($user['nom_usage'])) {
             $entry = new PlVCardEntry($user['prenom'], $user['nom'], null, null, @$user['nickname']);
@@ -160,10 +160,9 @@ class VCard extends PlVCard
         // Photo
         if ($this->photos) {
             $res = XDB::query(
-                    "SELECT attach, attachmime
-                       FROM photo   AS p
-                 INNER JOIN aliases AS a ON (a.id = p.uid AND a.type = 'a_vie')
-                      WHERE a.alias = {?}", $login);
+                    "SELECT  attach, attachmime
+                       FROM  photo AS p
+                      WHERE  u.user_id = {?}", $login->id());
             if ($res->numRows()) {
                 list($data, $type) = $res->fetchOneRow();
                 $entry->setPhoto($data, strtoupper($type));