projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
6083b25
..
0671343
100644
(file)
--- a/
include/vcard.inc.php
+++ b/
include/vcard.inc.php
@@
-36,9
+36,9
@@
class VCardIterator implements PlIterator
public function add_user($user)
{
public function add_user($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++;
}
}
$this->count++;
}
}
@@
-65,7
+65,7
@@
class VCardIterator implements PlIterator
}
global $globals;
$login = array_shift($this->user_list);
}
global $globals;
$login = array_shift($this->user_list);
- $user = get_user_details($login);
+ $user = get_user_details($login
->login()
);
if (strlen(trim($user['freetext']))) {
$user['freetext'] = pl_entity_decode($user['freetext']);
if (strlen(trim($user['freetext']))) {
$user['freetext'] = pl_entity_decode($user['freetext']);
@@
-96,10
+96,9
@@
class VCardIterator implements PlIterator
// get photo
if ($this->photos) {
$res = XDB::query(
// get 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()) {
$user['photo'] = $res->fetchOneAssoc();
}
if ($res->numRows()) {
$user['photo'] = $res->fetchOneAssoc();
}