diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-16 20:26:38 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-16 20:26:38 -0400 |
| commit | 6bc2d58a98d2756b16b4a6bdf2997348d0d65883 (patch) | |
| tree | 846aacbf5ceb7fc9c97ba4cf3891461f8122cfd1 /include/conversation.php | |
| parent | 0e9d5e0ce869a75498e1f5eff847b6037d6c1f67 (diff) | |
| parent | 82f2bfea5bbf7c35450eb8fe9ee119e0b00d3d61 (diff) | |
| download | volse-hubzilla-6bc2d58a98d2756b16b4a6bdf2997348d0d65883.tar.gz volse-hubzilla-6bc2d58a98d2756b16b4a6bdf2997348d0d65883.tar.bz2 volse-hubzilla-6bc2d58a98d2756b16b4a6bdf2997348d0d65883.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
convert boolean or int settings to strings to work around issues with template processing
add "send pm" link to photo dropdown for Diaspora contacts
* master:
Diffstat (limited to 'include/conversation.php')
| -rwxr-xr-x | include/conversation.php | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/include/conversation.php b/include/conversation.php index 88ecf502b..8ca484c9e 100755 --- a/include/conversation.php +++ b/include/conversation.php @@ -779,6 +779,17 @@ function item_photo_menu($item){ if(($cid) && (! $item['self'])) { $contact_url = $a->get_baseurl($ssl_state) . '/contacts/' . $cid; $posts_link = $a->get_baseurl($ssl_state) . '/network/?cid=' . $cid; + + $clean_url = normalise_link($item['author-link']); + + if((local_user()) && (local_user() == $item['uid'])) { + if(isset($a->contacts) && x($a->contacts,$clean_url)) { + if($a->contacts[$clean_url]['network'] === NETWORK_DIASPORA) { + $pm_url = $a->get_baseurl($ssl_state) . '/message/new/' . $cid; + } + } + } + } $menu = Array( |