aboutsummaryrefslogtreecommitdiffstats
path: root/mod/connections.php
diff options
context:
space:
mode:
authorRedMatrix <info@friendica.com>2014-05-04 20:08:22 +1000
committerRedMatrix <info@friendica.com>2014-05-04 20:08:22 +1000
commit6771aaec901e02a4fa0817ade01171477b79ed5e (patch)
treecd5a1f2cb41d529f20473d3a835af5fc4737c4c2 /mod/connections.php
parent5555daaf277b9e33914d40846bd7a0088fe2f70b (diff)
parent3f9513010fd605f7ebd3613098f3471e8f218e72 (diff)
downloadvolse-hubzilla-6771aaec901e02a4fa0817ade01171477b79ed5e.tar.gz
volse-hubzilla-6771aaec901e02a4fa0817ade01171477b79ed5e.tar.bz2
volse-hubzilla-6771aaec901e02a4fa0817ade01171477b79ed5e.zip
Merge pull request #441 from sasiflo/master
ifpending repaired. Show page "all contacts" directly if no pending conn...
Diffstat (limited to 'mod/connections.php')
-rw-r--r--mod/connections.php3
1 files changed, 2 insertions, 1 deletions
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']) {