diff options
| author | Habeas Codice <habeascodice@federated.social> | 2014-11-21 15:39:14 -0800 |
|---|---|---|
| committer | Habeas Codice <habeascodice@federated.social> | 2014-11-21 15:39:14 -0800 |
| commit | cf739c0361cce7f1c454a0e52809fba99cb40e84 (patch) | |
| tree | ff75671dc4075cef1b35553680222fc166cdb401 /include/conversation.php | |
| parent | b224f8056cbf9b41994b44e48a7ad154976d1c88 (diff) | |
| parent | f17ef6aa90bc283e122a88e627cb464f065af2a6 (diff) | |
| download | volse-hubzilla-cf739c0361cce7f1c454a0e52809fba99cb40e84.tar.gz volse-hubzilla-cf739c0361cce7f1c454a0e52809fba99cb40e84.tar.bz2 volse-hubzilla-cf739c0361cce7f1c454a0e52809fba99cb40e84.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/conversation.php')
| -rw-r--r-- | include/conversation.php | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/include/conversation.php b/include/conversation.php index 96864c29a..6db9d3ce4 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -885,15 +885,18 @@ function item_photo_menu($item){ $vsrc_link = ""; $follow_url = ""; - if(local_user()) { + + $local_user = local_user(); + + if($local_user) { $ssl_state = true; if(! count($a->contacts)) - load_contact_links(local_user()); + load_contact_links($local_user); $channel = $a->get_channel(); $channel_hash = (($channel) ? $channel['channel_hash'] : ''); } - if((local_user()) && local_user() == $item['uid']) { + if(($local_user) && $local_user == $item['uid']) { $vsrc_link = 'javascript:viewsrc(' . $item['id'] . '); return false;'; if($item['parent'] == $item['id'] && $channel && ($channel_hash != $item['author_xchan'])) { $sub_link = 'javascript:dosubthread(' . $item['id'] . '); return false;'; @@ -901,12 +904,13 @@ function item_photo_menu($item){ } $profile_link = chanlink_hash($item['author_xchan']); - $pm_url = $a->get_baseurl($ssl_state) . '/mail/new/?f=&hash=' . $item['author_xchan']; + if($item['uid'] > 0) + $pm_url = $a->get_baseurl($ssl_state) . '/mail/new/?f=&hash=' . $item['author_xchan']; if($a->contacts && array_key_exists($item['author_xchan'],$a->contacts)) $contact = $a->contacts[$item['author_xchan']]; else - if(local_user() && $item['author']['xchan_addr']) + if($local_user && $item['author']['xchan_addr']) $follow_url = z_root() . '/follow/?f=&url=' . $item['author']['xchan_addr']; if($contact) { |