aboutsummaryrefslogtreecommitdiffstats
path: root/include/conversation.php
diff options
context:
space:
mode:
authorTobias Diekershoff <tobias.diekershoff@gmx.net>2012-03-17 08:44:36 +0100
committerTobias Diekershoff <tobias.diekershoff@gmx.net>2012-03-17 08:44:36 +0100
commit96da328acf838faff3fe823f3dd7557d16fe1d8b (patch)
treefb26adfc9fc61077033fa707fae24ba70ee9876a /include/conversation.php
parent74c64ef2d244df47b2bea6527bbeb5cc62ca8845 (diff)
parent057a142b8cd01cd8ab6212e9d958989c82dfccc3 (diff)
downloadvolse-hubzilla-96da328acf838faff3fe823f3dd7557d16fe1d8b.tar.gz
volse-hubzilla-96da328acf838faff3fe823f3dd7557d16fe1d8b.tar.bz2
volse-hubzilla-96da328acf838faff3fe823f3dd7557d16fe1d8b.zip
Merge branch 'master' of https://github.com/friendica/friendica
Diffstat (limited to 'include/conversation.php')
-rwxr-xr-xinclude/conversation.php11
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(