diff options
| author | zottel <github@zottel.net> | 2012-03-17 01:49:17 +0100 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-03-17 01:49:17 +0100 |
| commit | c56e3c5dd4bcbb949282fd3b4c065ccfd4673726 (patch) | |
| tree | c4574eae6f2aaf68c50ccc1022944e0e1c45760b /include/conversation.php | |
| parent | ea4c806c5c3adacb6ef585de657e5f34c2e24c98 (diff) | |
| parent | 8af36b92bb3a78235f5741c764d034dc66b959b2 (diff) | |
| download | volse-hubzilla-c56e3c5dd4bcbb949282fd3b4c065ccfd4673726.tar.gz volse-hubzilla-c56e3c5dd4bcbb949282fd3b4c065ccfd4673726.tar.bz2 volse-hubzilla-c56e3c5dd4bcbb949282fd3b4c065ccfd4673726.zip | |
Merge remote branch 'upstream/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( |