diff options
| author | Mario <mario@mariovavti.com> | 2022-11-03 13:09:11 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2022-11-03 13:09:11 +0000 |
| commit | e80191d4cdadd38978579edf17bf8188d7729c4e (patch) | |
| tree | d7cdbb7a77e22c4bf9ce9d2a1802671acb6687da /Zotlabs/Module | |
| parent | c2a796b6ea4a8af23494e72e6c446ea847bf9627 (diff) | |
| download | volse-hubzilla-e80191d4cdadd38978579edf17bf8188d7729c4e.tar.gz volse-hubzilla-e80191d4cdadd38978579edf17bf8188d7729c4e.tar.bz2 volse-hubzilla-e80191d4cdadd38978579edf17bf8188d7729c4e.zip | |
fix regression
Diffstat (limited to 'Zotlabs/Module')
| -rw-r--r-- | Zotlabs/Module/Connections.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Dreport.php | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/Zotlabs/Module/Connections.php b/Zotlabs/Module/Connections.php index 0101bf8a8..ea30b9b9e 100644 --- a/Zotlabs/Module/Connections.php +++ b/Zotlabs/Module/Connections.php @@ -357,7 +357,7 @@ class Connections extends \Zotlabs\Web\Controller { 'oneway' => $oneway, 'perminfo' => $perminfo, 'connect' => (intval($rr['abook_not_here']) ? t('Connect') : ''), - 'follow' => z_root() . '/follow/?f=&url=' . urlencode($rr['xchan_hash']) . '&interactive=0', + 'follow' => z_root() . '/follow/?f=&url=' . urlencode($rr['xchan_hash']) . '&interactive=1', 'connect_hover' => t('Connect at this location'), 'role' => $roles_dict[$rr['abook_role']] ?? '', 'pending' => intval($rr['abook_pending']) diff --git a/Zotlabs/Module/Dreport.php b/Zotlabs/Module/Dreport.php index 759e1acb4..f5ad80eef 100644 --- a/Zotlabs/Module/Dreport.php +++ b/Zotlabs/Module/Dreport.php @@ -56,10 +56,12 @@ class Dreport extends \Zotlabs\Web\Controller { return; } - $r = q("select * from dreport where dreport_xchan = '%s' and (dreport_mid = '%s' or dreport_mid = '%s')", + $r = q("select * from dreport where dreport_xchan = '%s' and (dreport_mid = '%s' or dreport_mid = '%s' or dreport_mid = '%s' or dreport_mid = '%s')", dbesc($channel['channel_hash']), dbesc($mid), - dbesc(str_replace('/item/', '/activity/', $mid)) + dbesc($mid . '#sync'), + dbesc(str_replace('/item/', '/activity/', $mid)), + dbesc(str_replace('/item/', '/activity/', $mid) . '#sync') ); if(! $r) { |