aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-05-04 03:11:28 -0700
committerfriendica <info@friendica.com>2014-05-04 03:11:28 -0700
commit3da4656e412730706b8e0be44dc0a751d38fdee6 (patch)
tree44ea77fe276682640bdb6ec822a10ec76ce1d357
parent6771aaec901e02a4fa0817ade01171477b79ed5e (diff)
downloadvolse-hubzilla-3da4656e412730706b8e0be44dc0a751d38fdee6.tar.gz
volse-hubzilla-3da4656e412730706b8e0be44dc0a751d38fdee6.tar.bz2
volse-hubzilla-3da4656e412730706b8e0be44dc0a751d38fdee6.zip
hopefully this will fix it
-rw-r--r--mod/connections.php4
-rw-r--r--version.inc2
2 files changed, 3 insertions, 3 deletions
diff --git a/mod/connections.php b/mod/connections.php
index e2d467c60..b9605da01 100644
--- a/mod/connections.php
+++ b/mod/connections.php
@@ -213,10 +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 (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) and not (xchan_flags & %d )",
intval(local_user()),
- intval(ABOOK_FLAG_SELF|ABOOK_FLAG_PENDING|ABOOK_FLAG_IGNORED),
intval(ABOOK_FLAG_PENDING),
+ intval(ABOOK_FLAG_SELF|ABOOK_FLAG_IGNORED),
intval(XCHAN_FLAGS_DELETED|XCHAN_FLAGS_ORPHAN)
);
if($r && $r[0]['total']) {
diff --git a/version.inc b/version.inc
index c97e190a4..9bb9f37ef 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-05-03.664
+2014-05-04.665