diff options
| author | Christian Vogeley <christian.vogeley@hotmail.de> | 2013-09-15 03:21:19 +0200 |
|---|---|---|
| committer | Christian Vogeley <christian.vogeley@hotmail.de> | 2013-09-15 03:21:19 +0200 |
| commit | 4132d1cd8e59d2cf84d7578ac700c65d7954edd6 (patch) | |
| tree | 5586bb1bf97ad9e457de2eacb298d28e22c854ee /include/notifier.php | |
| parent | 496f869157ab76139d14a3c67fd8276ee6557517 (diff) | |
| parent | aefb0f823353d15a281d3c94ec6fc044e1b62580 (diff) | |
| download | volse-hubzilla-4132d1cd8e59d2cf84d7578ac700c65d7954edd6.tar.gz volse-hubzilla-4132d1cd8e59d2cf84d7578ac700c65d7954edd6.tar.bz2 volse-hubzilla-4132d1cd8e59d2cf84d7578ac700c65d7954edd6.zip | |
Upstream merge
Diffstat (limited to 'include/notifier.php')
| -rw-r--r-- | include/notifier.php | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/include/notifier.php b/include/notifier.php index 5dcd7b58c..e1f150bf2 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -208,9 +208,8 @@ function notifier_run($argv, $argc){ $channel = $s[0]; $uid = $item_id; $recipients = array(); - $r = q("select * from abook where abook_channel = %d and not (abook_flags & %d)", - intval($item_id), - intval(ABOOK_FLAG_SELF) + $r = q("select abook_xchan from abook where abook_channel = %d", + intval($item_id) ); if($r) { foreach($r as $rr) { @@ -373,6 +372,10 @@ function notifier_run($argv, $argc){ } } + if(($private) && (! $env_recips)) { + // shouldn't happen + logger('notifier: private message with no envelope recipients.' . print_r($argv,true)); + } logger('notifier: recipients (may be delivered to more if public): ' . print_r($recip_list,true), LOGGER_DEBUG); |