diff options
| author | friendica <info@friendica.com> | 2012-11-29 23:06:03 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-11-29 23:06:03 -0800 |
| commit | f7ff2de1321ede230555b1c717a70608246afc85 (patch) | |
| tree | 31c37e275850e3951cc17557eaf7921240604a68 /include/zot.php | |
| parent | c079133719f7f495a7bbc639577e1f6b3292b765 (diff) | |
| download | volse-hubzilla-f7ff2de1321ede230555b1c717a70608246afc85.tar.gz volse-hubzilla-f7ff2de1321ede230555b1c717a70608246afc85.tar.bz2 volse-hubzilla-f7ff2de1321ede230555b1c717a70608246afc85.zip | |
add pending check on group queries
Diffstat (limited to 'include/zot.php')
| -rw-r--r-- | include/zot.php | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/include/zot.php b/include/zot.php index 88568f09f..d098b1350 100644 --- a/include/zot.php +++ b/include/zot.php @@ -248,20 +248,22 @@ function zot_refresh($them,$channel = null) { $their_perms = $their_perms | intval($global_perms[$k][1]); } } -dbg(1); - $r = q("select * from abook where abook_xchan = '%s' and abook_channel = %d and not (abook_flags & %d) limit 1", + + $r = q("select * from abook where abook_xchan = '%s' and abook_channel = %d and not (abook_flags & %d) and not ( abook_flags & %d) limit 1", dbesc($x['hash']), intval($channel['channel_id']), - intval(ABOOK_FLAG_SELF) + intval(ABOOK_FLAG_SELF), + intval(ABOOK_FLAG_PENDING) ); if($r) { $y = q("update abook set abook_their_perms = %d where abook_xchan = '%s' and abook_channel = %d - and not (abook_flags & %d) limit 1", + and not (abook_flags & %d) and not ( abook_flags & %d) limit 1", intval($their_perms), dbesc($x['hash']), intval($channel['channel_id']), - intval(ABOOK_FLAG_SELF) + intval(ABOOK_FLAG_SELF), + intval(ABOOK_FLAG_PENDING) ); if(! $y) logger('abook update failed'); @@ -279,7 +281,7 @@ dbg(1); if($y) logger("New introduction received for {$channel['channel_name']}"); } -dbg(0); + } return true; |