diff options
| author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-02-06 08:48:07 +0100 |
|---|---|---|
| committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-02-06 08:48:07 +0100 |
| commit | dd3f21b98ab2777fbfccb72d6caccaa5a5541310 (patch) | |
| tree | a554f7881fd17b4850125bbeb3a3a077c873b05f /mod/photos.php | |
| parent | 0c83fb4d807d2cdf78acc4bd206bc7b278b01f53 (diff) | |
| parent | d322bb461326adac29e4b3a16d6638de74da2348 (diff) | |
| download | volse-hubzilla-dd3f21b98ab2777fbfccb72d6caccaa5a5541310.tar.gz volse-hubzilla-dd3f21b98ab2777fbfccb72d6caccaa5a5541310.tar.bz2 volse-hubzilla-dd3f21b98ab2777fbfccb72d6caccaa5a5541310.zip | |
Merge branch 'master' of git://github.com/friendika/friendika
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">'; |