diff options
| author | Mario <mario@mariovavti.com> | 2023-01-05 10:29:42 +0100 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2023-01-05 10:29:42 +0100 |
| commit | 23828f53bcd762f778b97c57a6d29ab59e83082d (patch) | |
| tree | 7c801a5f10ef17b1e9a12be83d67171ea6566f2e /Zotlabs | |
| parent | f909e129ab6a937b329f86947dd6fb1bf7bda662 (diff) | |
| download | volse-hubzilla-23828f53bcd762f778b97c57a6d29ab59e83082d.tar.gz volse-hubzilla-23828f53bcd762f778b97c57a6d29ab59e83082d.tar.bz2 volse-hubzilla-23828f53bcd762f778b97c57a6d29ab59e83082d.zip | |
pubstream: when going to conv from unthreaded mode stay in the module
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Pubstream.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Zotlabs/Module/Pubstream.php b/Zotlabs/Module/Pubstream.php index 7b8d75727..9d3a4f92b 100644 --- a/Zotlabs/Module/Pubstream.php +++ b/Zotlabs/Module/Pubstream.php @@ -40,7 +40,8 @@ class Pubstream extends \Zotlabs\Web\Controller { $site_firehose = ((intval(get_config('system','site_firehose',0))) ? true : false); - $mid = ((x($_REQUEST, 'mid')) ? unpack_link_id($_REQUEST['mid']) : ''); + $mid = (($_REQUEST['mid']) ? unpack_link_id($_REQUEST['mid']) : ''); + if ($mid === false) { notice(t('Malformed message id.') . EOL); return; @@ -261,7 +262,6 @@ class Pubstream extends \Zotlabs\Web\Controller { ); - // use effective_uid param of xchan_query to help sort out comment permission // for sys_channel owned items. @@ -277,8 +277,7 @@ class Pubstream extends \Zotlabs\Web\Controller { } - // fake it - $mode = (($hashtags) ? 'search' : 'pubstream'); + $mode = (($hashtags) ? 'pubstream-new' : 'pubstream'); $o .= conversation($items,$mode,$update,$page_mode); |