aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRedMatrix <info@friendica.com>2014-05-05 06:43:31 +1000
committerRedMatrix <info@friendica.com>2014-05-05 06:43:31 +1000
commit5344e73cdadda2715cb6cf5eae7517c91d14b4ee (patch)
treeae9710d4517dcd979a98d232c7bc93bbdc411d8e
parent98a942bd95cc2a03bb47be1e33257a947c080f6f (diff)
parentb472cc0fd3353eb965ed758d3f7e8ba5641c18c1 (diff)
downloadvolse-hubzilla-5344e73cdadda2715cb6cf5eae7517c91d14b4ee.tar.gz
volse-hubzilla-5344e73cdadda2715cb6cf5eae7517c91d14b4ee.tar.bz2
volse-hubzilla-5344e73cdadda2715cb6cf5eae7517c91d14b4ee.zip
Merge pull request #443 from sasiflo/master
ifpending repaired again. Hope it works as intended now.
-rw-r--r--mod/connections.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/mod/connections.php b/mod/connections.php
index b9605da01..3c3a704b2 100644
--- a/mod/connections.php
+++ b/mod/connections.php
@@ -213,7 +213,7 @@ 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 (abook_flags & %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 (abook_flags & %d) and not ((abook_flags & %d) or (xchan_flags & %d))",
intval(local_user()),
intval(ABOOK_FLAG_PENDING),
intval(ABOOK_FLAG_SELF|ABOOK_FLAG_IGNORED),