aboutsummaryrefslogtreecommitdiffstats
path: root/include/conversation.php
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2018-03-04 06:45:07 -0500
committerAndrew Manning <tamanning@zoho.com>2018-03-04 06:45:07 -0500
commit058f7277b52bdcdb80dc3e28bf0ec93a573195a7 (patch)
tree32ca12ca4eb390396e429b1e86fd79de614f2551 /include/conversation.php
parent39fe80a196ee626dda15b5b844dd1d05893f7646 (diff)
parent471c3c4d068d1c6d4e149098d400d792fb3550a6 (diff)
downloadvolse-hubzilla-058f7277b52bdcdb80dc3e28bf0ec93a573195a7.tar.gz
volse-hubzilla-058f7277b52bdcdb80dc3e28bf0ec93a573195a7.tar.bz2
volse-hubzilla-058f7277b52bdcdb80dc3e28bf0ec93a573195a7.zip
Merge branch 'dev' into oauth2
Diffstat (limited to 'include/conversation.php')
-rw-r--r--include/conversation.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/conversation.php b/include/conversation.php
index 0bb9c769a..6374267eb 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1005,7 +1005,7 @@ function thread_author_menu($item, $mode = '') {
$contact = App::$contacts[$item['author_xchan']];
else
if($local_channel && $item['author']['xchan_addr'])
- $follow_url = z_root() . '/follow/?f=&url=' . urlencode($item['author']['xchan_addr']);
+ $follow_url = z_root() . '/follow/?f=&url=' . urlencode($item['author']['xchan_addr']) . '&interactive=0';
if($item['uid'] > 0 && author_is_pmable($item['author'],$contact)) {
@@ -1051,8 +1051,8 @@ function thread_author_menu($item, $mode = '') {
'menu' => 'follow',
'title' => t('Connect'),
'icon' => 'fw',
- 'action' => '',
- 'href' => $follow_url
+ 'action' => 'doFollowAuthor(\'' . $follow_url . '\'); return false;',
+ 'href' => '#',
];
}