harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ifpending repaired. Show page "all contacts" directly if no pending connections.

Browse Source 
Tried to repair. Think the merge of flags was wrong in the last
commit.
This commit is contained in:
sasiflo 2014-05-04 11:41:31 +02:00
parent 5555daaf27
commit 3f9513010f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mod/connections.php
View File

@ -213,9 +213,10 @@ function connections_content(&$a) {
nav_set_selected('intros'); nav_set_selected('intros');
break; break;
case 'ifpending': 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(local_user()),
intval(ABOOK_FLAG_SELF|ABOOK_FLAG_PENDING|ABOOK_FLAG_IGNORED), intval(ABOOK_FLAG_SELF|ABOOK_FLAG_PENDING|ABOOK_FLAG_IGNORED),
intval(ABOOK_FLAG_PENDING),
intval(XCHAN_FLAGS_DELETED|XCHAN_FLAGS_ORPHAN) intval(XCHAN_FLAGS_DELETED|XCHAN_FLAGS_ORPHAN)
); );
if($r && $r[0]['total']) { if($r && $r[0]['total']) {