diff options
author | Friendika <info@friendika.com> | 2011-04-04 03:05:30 -0700 |
---|---|---|
committer | Friendika <info@friendika.com> | 2011-04-04 03:05:30 -0700 |
commit | 5a62d022a2ab7039fb7529d37e81447116abcbea (patch) | |
tree | 4ce91085ce0d06d70c3c65792835da86ba31b48e | |
parent | 379af2521559c263622348bce41872b61067e532 (diff) | |
parent | 7bfd0e2c488b63818abca612ec65fb73734755e1 (diff) | |
download | volse-hubzilla-5a62d022a2ab7039fb7529d37e81447116abcbea.tar.gz volse-hubzilla-5a62d022a2ab7039fb7529d37e81447116abcbea.tar.bz2 volse-hubzilla-5a62d022a2ab7039fb7529d37e81447116abcbea.zip |
Merge branch 'iconpopup' of https://github.com/fabrixxm/friendika into fabrixxm-iconpopup
-rw-r--r-- | boot.php | 14 |
1 files changed, 9 insertions, 5 deletions
@@ -2694,8 +2694,10 @@ function item_photo_menu($item){ $status_link = $redirect_url."?url=status"; $profile_link = $redirect_url."?url=profile"; $photos_link = $redirect_url."?url=photos"; - $pm_url = $a->get_baseurl() . '/message/new/' . $item['cid'] ; - $contact_url = $item['self']?"":$a->get_baseurl() . '/contacts/' . $item['cid'] ; + if (local_user()){ + $pm_url = $a->get_baseurl() . '/message/new/' . $item['cid']; + $contact_url = $item['self']?"":$a->get_baseurl() . '/contacts/' . $item['cid']; + } } elseif(isset($a->authors[$item['author-link']])) { $redirect_url = $a->get_baseurl() . '/redir/' . $a->authors[$item['author-link']]['id']; @@ -2703,10 +2705,12 @@ function item_photo_menu($item){ $profile_link = $redirect_url."?url=profile"; $photos_link = $redirect_url."?url=photos"; - if ($a->authors[$item['author-link']]['network']==='dfrn'){ - $pm_url = $a->get_baseurl() . '/message/new/' . $a->authors[$item['author-link']]['id']; + if (local_user()){ + if ($a->authors[$item['author-link']]['network']==='dfrn'){ + $pm_url = $a->get_baseurl() . '/message/new/' . $a->authors[$item['author-link']]['id']; + } + $contact_url = $item['self']?"":$a->get_baseurl() . '/contacts/' . $a->authors[$item['author-link']]['id'] ; } - $contact_url = $item['self']?"":$a->get_baseurl() . '/contacts/' . $a->authors[$item['author-link']]['id'] ; } } |