diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/identity.php | 4 | ||||
| -rwxr-xr-x | include/items.php | 9 | ||||
| -rw-r--r-- | include/taxonomy.php | 16 |
3 files changed, 26 insertions, 3 deletions
diff --git a/include/identity.php b/include/identity.php index b086da94f..1cbe43b1e 100644 --- a/include/identity.php +++ b/include/identity.php @@ -1044,10 +1044,12 @@ function advanced_profile(&$a) { $things = get_things($a->profile['profile_guid'],$a->profile['profile_uid']); - logger('mod_profile: things: ' . print_r($things,true), LOGGER_DATA); +// logger('mod_profile: things: ' . print_r($things,true), LOGGER_DATA); return replace_macros($tpl, array( '$title' => t('Profile'), + '$canlike' => (($profile['canlike'])? true : false), + '$likethis' => t('Like this thing'), '$profile' => $profile, '$things' => $things )); diff --git a/include/items.php b/include/items.php index c35a442b2..b80f18b72 100755 --- a/include/items.php +++ b/include/items.php @@ -3722,6 +3722,15 @@ function delete_item_lowlevel($item,$stage = DROPITEM_NORMAL) { break; } + + // immediately remove any undesired profile likes. + + q("delete from likes where iid = %d and channel_id = %d limit 1", + intval($item['id']), + intval($item['uid']) + ); + + // network deletion request. Keep the message structure so that we can deliver delete notifications. // Come back after several days (or perhaps a month) to do the lowlevel delete (DROPITEM_PHASE2). diff --git a/include/taxonomy.php b/include/taxonomy.php index 4f2b5e8fd..803e1ae0a 100644 --- a/include/taxonomy.php +++ b/include/taxonomy.php @@ -322,9 +322,21 @@ function get_things($profile_hash,$uid) { foreach($v as $k => $foo) $things[$k] = null; foreach($r as $rr) { + + $l = q("select xchan_name, 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['term_hash']), + intval($uid) + ); + + for($x = 0; $x < count($l); $x ++) + $l[$x]['xchan_url'] = zid($l[$x]['xchan_url']); + if(! $things[$rr['obj_verb']]) $things[$rr['obj_verb']] = array(); - $things[$rr['obj_verb']][] = array('term' => $rr['term'],'url' => $rr['url'],'img' => $rr['imgurl'], 'profile' => $rr['profile_name']); + $things[$rr['obj_verb']][] = array('term' => $rr['term'],'url' => $rr['url'],'img' => $rr['imgurl'], 'profile' => $rr['profile_name'],'term_hash' => $rr['term_hash'], 'likes' => $l,'like_count' => count($l),'like_label' => tt('Like','Likes',count($l),'noun')); + } $sorted_things = array(); if($things) { @@ -335,7 +347,7 @@ function get_things($profile_hash,$uid) { } } } - +//logger('things: ' . print_r($sorted_things,true)); return $sorted_things; }
\ No newline at end of file |