aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-12-09 19:57:02 -0800
committerfriendica <info@friendica.com>2012-12-09 19:57:02 -0800
commit47235e5b32d8e38f4f849af5458ee1c1715522e0 (patch)
tree45c2d6736c56a6649fcd75bc7232a41b69d30b28 /boot.php
parentf8c33243bf0440c6ddab63dbf3a755e4d506122b (diff)
downloadvolse-hubzilla-47235e5b32d8e38f4f849af5458ee1c1715522e0.tar.gz
volse-hubzilla-47235e5b32d8e38f4f849af5458ee1c1715522e0.tar.bz2
volse-hubzilla-47235e5b32d8e38f4f849af5458ee1c1715522e0.zip
start whipping the item photo menu into shape
Diffstat (limited to 'boot.php')
-rw-r--r--boot.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/boot.php b/boot.php
index f1ce32dbc..c8d467515 100644
--- a/boot.php
+++ b/boot.php
@@ -1770,13 +1770,13 @@ if(! function_exists('load_contact_links')) {
if(! $uid || x($a->contacts,'empty'))
return;
- $r = q("SELECT `id`,`network`,`url`,`thumb` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 ",
- intval($uid)
+ $r = q("SELECT abook_id, abook_flags, abook_my_perms, abook_their_perms, xchan_hash, xchan_photo_m, xchan_name, xchan_url from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and not (abook_flags & %d) ",
+ intval($uid),
+ intval(ABOOK_FLAG_SELF)
);
- if(count($r)) {
+ if($r) {
foreach($r as $rr){
- $url = normalise_link($rr['url']);
- $ret[$url] = $rr;
+ $ret[$rr['xchan_hash']] = $rr;
}
}
else