diff options
| author | Paolo T <tuscanhobbit@users.noreply.github.com> | 2014-09-18 08:41:41 +0200 |
|---|---|---|
| committer | Paolo T <tuscanhobbit@users.noreply.github.com> | 2014-09-18 08:41:41 +0200 |
| commit | 7da97c198182f8f6f4286e16d80de205431d81bb (patch) | |
| tree | d03c22c98fa5e522fef874554be307969154c792 /include/notifier.php | |
| parent | 4f793069bf4aafcfe77d50e47690173104ef23c7 (diff) | |
| parent | 0b47fb9a91b58147e616ea75a23dea0d431c40f8 (diff) | |
| download | volse-hubzilla-7da97c198182f8f6f4286e16d80de205431d81bb.tar.gz volse-hubzilla-7da97c198182f8f6f4286e16d80de205431d81bb.tar.bz2 volse-hubzilla-7da97c198182f8f6f4286e16d80de205431d81bb.zip | |
Merge pull request #3 from friendica/master
Merge from upstream
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 ae781bcf8..3f34d6133 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -455,8 +455,8 @@ function notifier_run($argv, $argc){ // for public posts always include our own hub - - $sql_extra = (($private) ? "" : " or hubloc_url = '" . dbesc(z_root()) . "' "); +// this shouldn't be needed any more. collect_recipients should take care of it. +// $sql_extra = (($private) ? "" : " or hubloc_url = '" . dbesc(z_root()) . "' "); logger('notifier: hub choice: ' . intval($relay_to_owner) . ' ' . intval($private) . ' ' . $cmd, LOGGER_DEBUG); @@ -478,7 +478,9 @@ function notifier_run($argv, $argc){ } else { $r = q("select hubloc_guid, hubloc_url, hubloc_sitekey, hubloc_network, hubloc_flags, hubloc_callback, hubloc_host from hubloc - where hubloc_hash in (" . implode(',',$recipients) . ") $sql_extra group by hubloc_sitekey"); + where hubloc_hash in (" . implode(',',$recipients) . ") and not (hubloc_flags & %d) group by hubloc_sitekey", + intval(HUBLOC_FLAGS_DELETED) + ); } if(! $r) { @@ -493,6 +495,7 @@ function notifier_run($argv, $argc){ foreach($hubs as $hub) { // don't try to deliver to deleted hublocs - and inexplicably SQL "distinct" and "group by" // both return records with duplicate keys in rare circumstances +// FIXME this is probably redundant now. if((! ($hub['hubloc_flags'] & HUBLOC_FLAGS_DELETED)) && (! in_array($hub['hubloc_sitekey'],$keys))) { $hublist[] = $hub['hubloc_host']; $keys[] = $hub['hubloc_sitekey']; |