diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-02-02 17:51:34 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-02-02 17:51:34 +0100 |
| commit | 36ac48779c85ae324d2d702714677e360af5930d (patch) | |
| tree | f6e78cb3cefe3abf5dcac291938005d75ecb0bff /include/taxonomy.php | |
| parent | 0cd82ec680e6a5a352781861a63685038fea723a (diff) | |
| parent | 88669fa033d5b43d4cdad7b95c9af05bf9467d3b (diff) | |
| download | volse-hubzilla-36ac48779c85ae324d2d702714677e360af5930d.tar.gz volse-hubzilla-36ac48779c85ae324d2d702714677e360af5930d.tar.bz2 volse-hubzilla-36ac48779c85ae324d2d702714677e360af5930d.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/taxonomy.php')
| -rw-r--r-- | include/taxonomy.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/taxonomy.php b/include/taxonomy.php index 0bf89a7c1..5ef106938 100644 --- a/include/taxonomy.php +++ b/include/taxonomy.php @@ -398,16 +398,17 @@ function get_things($profile_hash,$uid) { $things[$k] = null; foreach($r as $rr) { - $l = q("select xchan_name, xchan_url from likes left join xchan on likee = xchan_hash where + $l = q("select xchan_name, xchan_photo_s, xchan_url from likes left join xchan on likee = xchan_hash where target_type = '%s' and target_id = '%s' and channel_id = %d", dbesc(ACTIVITY_OBJ_THING), dbesc($rr['obj_obj']), intval($uid) ); - for($x = 0; $x < count($l); $x ++) + for($x = 0; $x < count($l); $x ++) { $l[$x]['xchan_url'] = zid($l[$x]['xchan_url']); - + $l[$x]['xchan_photo_s'] = zid($l[$x]['xchan_photo_s']); + } if(! $things[$rr['obj_verb']]) $things[$rr['obj_verb']] = array(); |