diff options
author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2017-10-24 17:56:20 +0200 |
---|---|---|
committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2017-10-24 17:56:20 +0200 |
commit | 280baf7c828e967ed563752b899f97424f1e1da0 (patch) | |
tree | 2a3dd7b2e480ba81399ac5b7cb25dda53af3aa15 /Zotlabs/Daemon | |
parent | c99962106d6f9a65f01c2be4a9708d35dec7ca90 (diff) | |
parent | 2aff3a1a05d7249a69115938c239a91658777e39 (diff) | |
download | volse-hubzilla-280baf7c828e967ed563752b899f97424f1e1da0.tar.gz volse-hubzilla-280baf7c828e967ed563752b899f97424f1e1da0.tar.bz2 volse-hubzilla-280baf7c828e967ed563752b899f97424f1e1da0.zip |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
Diffstat (limited to 'Zotlabs/Daemon')
-rw-r--r-- | Zotlabs/Daemon/Notifier.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Daemon/Notifier.php b/Zotlabs/Daemon/Notifier.php index 84212270f..d0175549b 100644 --- a/Zotlabs/Daemon/Notifier.php +++ b/Zotlabs/Daemon/Notifier.php @@ -433,7 +433,7 @@ class Notifier { $env_recips = (($private) ? array() : null); - $details = q("select xchan_hash, xchan_instance_url, xchan_network, xchan_addr, xchan_guid, xchan_guid_sig from xchan where xchan_hash in (" . implode(',',$recipients) . ")"); + $details = q("select xchan_hash, xchan_instance_url, xchan_network, xchan_addr, xchan_guid, xchan_guid_sig from xchan where xchan_hash in (" . protect_sprintf(implode(',',$recipients)) . ")"); $recip_list = array(); @@ -500,7 +500,7 @@ class Notifier { // Now we have collected recipients (except for external mentions, FIXME) // Let's reduce this to a set of hubs; checking that the site is not dead. - $r = q("select hubloc.*, site.site_crypto, site.site_flags from hubloc left join site on site_url = hubloc_url where hubloc_hash in (" . implode(',',$recipients) . ") + $r = q("select hubloc.*, site.site_crypto, site.site_flags from hubloc left join site on site_url = hubloc_url where hubloc_hash in (" . protect_sprintf(implode(',',$recipients)) . ") and hubloc_error = 0 and hubloc_deleted = 0 and ( site_dead = 0 OR site_dead is null ) " ); |