diff options
| author | nobody <nobody@zotlabs.com> | 2021-06-17 14:57:47 -0700 |
|---|---|---|
| committer | nobody <nobody@zotlabs.com> | 2021-06-17 14:57:47 -0700 |
| commit | efda8aac1d7d90fd7eda4a449332eedf74342951 (patch) | |
| tree | 3373c0579168776cccda5224b6b33ce59fa9b274 /include/conversation.php | |
| parent | 686530c1873f98d724355bf3f456243b1b7fdadd (diff) | |
| parent | a84cec4acddf6804a88fcda52e4437c91785dfb2 (diff) | |
| download | volse-hubzilla-efda8aac1d7d90fd7eda4a449332eedf74342951.tar.gz volse-hubzilla-efda8aac1d7d90fd7eda4a449332eedf74342951.tar.bz2 volse-hubzilla-efda8aac1d7d90fd7eda4a449332eedf74342951.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'include/conversation.php')
| -rw-r--r-- | include/conversation.php | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/include/conversation.php b/include/conversation.php index 04aa1ef5a..39ff8d7ad 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1022,8 +1022,6 @@ function author_is_pmable($xchan, $abook) { if($x['result'] !== 'unset') return $x['result']; - if($xchan['xchan_network'] === 'zot' && get_observer_hash()) - return true; return false; } @@ -1059,9 +1057,6 @@ function thread_author_menu($item, $mode = '') { $follow_url = z_root() . '/follow/?f=&url=' . urlencode($url) . '&interactive=0'; } } - if($item['uid'] > 0 && author_is_pmable($item['author'],$contact)) { - $pm_url = z_root() . '/mail/new/?f=&hash=' . urlencode($item['author_xchan']); - } } if($contact) { @@ -1693,9 +1688,6 @@ function prepare_page($item) { // ... other possible options } - // prepare_body calls unobscure() as a side effect. Do it here so that - // the template will get passed an unobscured title. - $body = prepare_body($item, [ 'newwin' => false ]); if(App::$page['template'] == 'none') { $tpl = 'page_display_empty.tpl'; |