diff options
| author | Friendika <info@friendika.com> | 2011-02-05 13:05:57 -0800 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-02-05 13:05:57 -0800 |
| commit | 8a55168d4f470fb06b2e02896541688d3967bae5 (patch) | |
| tree | d00fe193bfdde9c94a9b11ef96ef348150137f64 /mod/photos.php | |
| parent | ebbdb7b301d8ab5a1eb249a68888d1dd772a06c3 (diff) | |
| parent | fb7959cfc0541604b9d931e2ba28af8411ab4685 (diff) | |
| download | volse-hubzilla-8a55168d4f470fb06b2e02896541688d3967bae5.tar.gz volse-hubzilla-8a55168d4f470fb06b2e02896541688d3967bae5.tar.bz2 volse-hubzilla-8a55168d4f470fb06b2e02896541688d3967bae5.zip | |
Merge branch 'ph2pr' of https://github.com/fabrixxm/friendika into fabrixxm-master
Diffstat (limited to 'mod/photos.php')
| -rw-r--r-- | mod/photos.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mod/photos.php b/mod/photos.php index 52cc66eae..1a1ebaac1 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -915,6 +915,7 @@ function photos_content(&$a) { if($can_post && ($ph[0]['uid'] == $owner_uid)) { $o .= '<div id="photo-edit-link-wrap" ><a id="photo-edit-link" href="' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $datum . '/edit' . '">' . t('Edit photo') . '</a>'; + $o .= ' - <a id="photo-toprofile-link" href="' . $a->get_baseurl() . '/profile_photo/use/'.$ph[0]['resource-id'].'">'.t('Use as profile photo').'</a>'; // lock $o .= ( ( ($ph[0]['uid'] == local_user()) && (strlen($ph[0]['allow_cid']) || strlen($ph[0]['allow_gid']) || strlen($ph[0]['deny_cid']) || strlen($ph[0]['deny_gid'])) ) @@ -1064,7 +1065,7 @@ function photos_content(&$a) { like_puller($a,$item,$dlike,'dislike'); } - $like = ((isset($alike[$link_item['id']])) ? format_like($alike[$link_item['id']],$alike[$link_item['id'] . '-l'],'like',$link_item['id']) : ''); + $like = ((isset($alike[$link_item['id']])) ? format_like($alike[$link_item['id']],$alike[$link_item['id'] . '-l'],'like',$link_item['id']) : ''); $dislike = ((isset($dlike[$link_item['id']])) ? format_like($dlike[$link_item['id']],$dlike[$link_item['id'] . '-l'],'dislike',$link_item['id']) : ''); $o .= '<div id="photo-like-div">'; |