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 /mod/ping.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 'mod/ping.php')
| -rw-r--r-- | mod/ping.php | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/mod/ping.php b/mod/ping.php index 593ae21f8..e5fc4d930 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -300,11 +300,10 @@ function ping_init(&$a) { if(argc() > 1 && (argv(1) === 'intros')) { $result = array(); - $r = q("SELECT * FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and (abook_flags & %d) > 0 and not ((abook_flags & %d) > 0 or (xchan_flags & %d) > 0) ORDER BY abook_created DESC", + $r = q("SELECT * FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and (abook_flags & %d) > 0 and not ((abook_flags & %d) > 0 or xchan_deleted = 1 or xchan_orphan = 1) ORDER BY abook_created DESC", intval(local_user()), intval(ABOOK_FLAG_PENDING), - intval(ABOOK_FLAG_SELF|ABOOK_FLAG_IGNORED), - intval(XCHAN_FLAGS_DELETED|XCHAN_FLAGS_ORPHAN) + intval(ABOOK_FLAG_SELF|ABOOK_FLAG_IGNORED) ); if($r) { @@ -413,11 +412,10 @@ function ping_init(&$a) { $t2 = dba_timer(); if($vnotify & VNOTIFY_INTRO) { - $intr = q("SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and (abook_flags & %d) > 0 and not ((abook_flags & %d) > 0 or (xchan_flags & %d) > 0)", + $intr = q("SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and (abook_flags & %d) > 0 and not ((abook_flags & %d) > 0 or xchan_deleted = 1 or xchan_orphan = 1)", intval(local_user()), intval(ABOOK_FLAG_PENDING), - intval(ABOOK_FLAG_SELF|ABOOK_FLAG_IGNORED), - intval(XCHAN_FLAGS_DELETED|XCHAN_FLAGS_ORPHAN) + intval(ABOOK_FLAG_SELF|ABOOK_FLAG_IGNORED) ); $t3 = dba_timer(); |