diff options
| author | zotlabs <mike@macgirvin.com> | 2018-02-16 16:42:45 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-02-16 16:42:45 -0800 |
| commit | 4e6072fb292dafea788baf70ad69d14d25119dac (patch) | |
| tree | 99349214b914bb8cabf754ba8e4c093c5b5ceeeb /Zotlabs/Module/Channel.php | |
| parent | f492f808f4861ae9937dcaf3bf8476513ae1c091 (diff) | |
| parent | 547ef772ab1bcdf9cff1ad6d0593f3d27bb33d73 (diff) | |
| download | volse-hubzilla-4e6072fb292dafea788baf70ad69d14d25119dac.tar.gz volse-hubzilla-4e6072fb292dafea788baf70ad69d14d25119dac.tar.bz2 volse-hubzilla-4e6072fb292dafea788baf70ad69d14d25119dac.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'Zotlabs/Module/Channel.php')
| -rw-r--r-- | Zotlabs/Module/Channel.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php index 3dab85410..231146999 100644 --- a/Zotlabs/Module/Channel.php +++ b/Zotlabs/Module/Channel.php @@ -251,9 +251,9 @@ class Channel extends \Zotlabs\Web\Controller { else { $r = q("SELECT item.parent AS item_id FROM item left join abook on ( item.author_xchan = abook.abook_xchan $abook_uids ) - WHERE true and uid = %d $item_normal + WHERE true and item.uid = %d AND item.item_thread_top = 1 $item_normal AND (abook.abook_blocked = 0 or abook.abook_flags is null) - AND item.item_wall = 1 AND item.item_thread_top = 1 + AND item.item_wall = 1 $sql_extra $sql_extra2 ORDER BY created DESC $pager_sql ", intval(\App::$profile['profile_uid']) |