diff options
author | friendica <info@friendica.com> | 2015-01-20 19:33:19 -0800 |
---|---|---|
committer | friendica <info@friendica.com> | 2015-01-20 19:33:19 -0800 |
commit | 51848c619080e19cace647966a17eb9a1b42ca25 (patch) | |
tree | 6aee6c9487813051801cabbd2a4914528232d5b5 /include/socgraph.php | |
parent | ee3eee425c92b37fba5a7035d8e9ec0b0b563d0b (diff) | |
download | volse-hubzilla-51848c619080e19cace647966a17eb9a1b42ca25.tar.gz volse-hubzilla-51848c619080e19cace647966a17eb9a1b42ca25.tar.bz2 volse-hubzilla-51848c619080e19cace647966a17eb9a1b42ca25.zip |
working through the xchan table to remove bitfields, mostly complete except for updating the updater
Diffstat (limited to 'include/socgraph.php')
-rw-r--r-- | include/socgraph.php | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/include/socgraph.php b/include/socgraph.php index 15ef480f6..466f4212d 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -340,14 +340,12 @@ function suggestion_query($uid, $myxchan, $start = 0, $limit = 80) { and not xlink_link in ( select abook_xchan from abook where abook_channel = %d ) and not xlink_link in ( select xchan from xign where uid = %d ) and xlink_xchan != '' - and not ( xchan_flags & %d )>0 - and not ( xchan_flags & %d )>0 + and xchan_hidden = 0 + and xchan_deleted = 0 group by xchan_hash order by total desc limit %d offset %d ", intval($uid), intval($uid), intval($uid), - intval(XCHAN_FLAGS_HIDDEN), - intval(XCHAN_FLAGS_DELETED), intval($limit), intval($start) ); @@ -360,13 +358,11 @@ function suggestion_query($uid, $myxchan, $start = 0, $limit = 80) { where xlink_xchan = '' and not xlink_link in ( select abook_xchan from abook where abook_channel = %d ) and not xlink_link in ( select xchan from xign where uid = %d ) - and not ( xchan_flags & %d )>0 - and not ( xchan_flags & %d )>0 + and xchan_hidden = 0 + and xchan_deleted = 0 group by xchan_hash order by total desc limit %d offset %d ", intval($uid), intval($uid), - intval(XCHAN_FLAGS_HIDDEN), - intval(XCHAN_FLAGS_DELETED), intval($limit), intval($start) ); |