From 3f9513010fd605f7ebd3613098f3471e8f218e72 Mon Sep 17 00:00:00 2001 From: sasiflo Date: Sun, 4 May 2014 11:41:31 +0200 Subject: ifpending repaired. Show page "all contacts" directly if no pending connections. Tried to repair. Think the merge of flags was wrong in the last commit. --- mod/connections.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mod/connections.php') diff --git a/mod/connections.php b/mod/connections.php index e95f72b49..e2d467c60 100644 --- a/mod/connections.php +++ b/mod/connections.php @@ -213,9 +213,10 @@ function connections_content(&$a) { nav_set_selected('intros'); break; case 'ifpending': - $r = 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 not (abook_flags & %d) and not (xchan_flags & %d )", + $r = 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 not (abook_flags & %d) and (abook_flags & %d) and not (xchan_flags & %d )", intval(local_user()), intval(ABOOK_FLAG_SELF|ABOOK_FLAG_PENDING|ABOOK_FLAG_IGNORED), + intval(ABOOK_FLAG_PENDING), intval(XCHAN_FLAGS_DELETED|XCHAN_FLAGS_ORPHAN) ); if($r && $r[0]['total']) { -- cgit v1.2.3