diff options
author | redmatrix <git@macgirvin.com> | 2016-02-25 16:21:38 -0800 |
---|---|---|
committer | redmatrix <git@macgirvin.com> | 2016-02-25 16:21:38 -0800 |
commit | dc8c7a2d2e8060d295c46637e2f1caac76aca6fa (patch) | |
tree | 33b2f1b54b43643b81a98d34107ec096898c0cd6 | |
parent | ba2ede0a8f82be98994f129655dbb78d5c024e47 (diff) | |
download | volse-hubzilla-dc8c7a2d2e8060d295c46637e2f1caac76aca6fa.tar.gz volse-hubzilla-dc8c7a2d2e8060d295c46637e2f1caac76aca6fa.tar.bz2 volse-hubzilla-dc8c7a2d2e8060d295c46637e2f1caac76aca6fa.zip |
small improvements to profile like activity
-rw-r--r-- | include/identity.php | 3 | ||||
-rwxr-xr-x | mod/like.php | 11 |
2 files changed, 10 insertions, 4 deletions
diff --git a/include/identity.php b/include/identity.php index 0a88ed208..caf2de710 100644 --- a/include/identity.php +++ b/include/identity.php @@ -1832,8 +1832,7 @@ function get_zcard($channel,$observer_hash = '',$args = array()) { $cover['href'] = z_root() . '/photo/' . $r[0]['resource_id'] . '-' . $r[0]['scale']; } else { - // @fixme remove this when we have a fallback cover photo and use that instead. - return; + $cover = $pphoto; } $o .= replace_macros(get_markup_template('zcard.tpl'),array( diff --git a/mod/like.php b/mod/like.php index ce8bc3063..26c39bf3b 100755 --- a/mod/like.php +++ b/mod/like.php @@ -107,13 +107,13 @@ function like_content(&$a) { // to them. $allow_cid = $allow_gid = $deny_cid = $deny_gid = ''; foreach($d as $dd) { - $allow_gid .= '<' . $dd['abook_xchan'] . '>'; + $allow_cid .= '<' . $dd['abook_xchan'] . '>'; } } $post_type = t('channel'); $objtype = ACTIVITY_OBJ_PROFILE; - + $profile = $r[0]; } elseif($obj_type == 'thing') { @@ -462,6 +462,13 @@ function like_content(&$a) { if($obj_type === 'thing' && $r[0]['imgurl']) { $arr['body'] .= "\n\n[zmg=80x80]" . $r[0]['imgurl'] . '[/zmg]'; } + if($obj_type === 'profile') { + if($public) { + $arr['body'] .= "\n\n" . '[embed]' . z_root() . '/profile/' . $ch[0]['channel_address'] . '[/embed]'; + } + else + $arr['body'] .= "\n\n[zmg=80x80]" . $profile['thumb'] . '[/zmg]'; + } $arr['verb'] = $activity; |