aboutsummaryrefslogtreecommitdiffstats
path: root/include/notifier.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-08-26 18:58:48 -0700
committerfriendica <info@friendica.com>2014-08-26 18:58:48 -0700
commit6a42d6fe3b1e50af16942d0f22e8cfa01abfde39 (patch)
treec4bc72223e915a2e83aed11ca09daa059ad6a8c3 /include/notifier.php
parente42205cec25fbe7ee93fde4a0f267d54b0e30193 (diff)
downloadvolse-hubzilla-6a42d6fe3b1e50af16942d0f22e8cfa01abfde39.tar.gz
volse-hubzilla-6a42d6fe3b1e50af16942d0f22e8cfa01abfde39.tar.bz2
volse-hubzilla-6a42d6fe3b1e50af16942d0f22e8cfa01abfde39.zip
works one way sort of - now to go the other way - which will require fixing a whole slew of FIXMEs
Diffstat (limited to 'include/notifier.php')
-rw-r--r--include/notifier.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/notifier.php b/include/notifier.php
index 5f4462b6a..88bb9a0cb 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -412,7 +412,7 @@ function notifier_run($argv, $argc){
$recip_list[] = $d['xchan_addr'] . ' (' . $d['xchan_hash'] . ')';
if($private)
- $env_recips[] = array('guid' => $d['xchan_guid'],'guid_sig' => $d['xchan_guid_sig']);
+ $env_recips[] = array('guid' => $d['xchan_guid'],'guid_sig' => $d['xchan_guid_sig'],'hash' => $d['xchan_hash']);
}
}
@@ -445,11 +445,11 @@ function notifier_run($argv, $argc){
// aren't the owner or author.
- $r = q("select hubloc_guid, hubloc_sitekey, hubloc_network, hubloc_flags, hubloc_callback, hubloc_host from hubloc
+ $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) . ") group by hubloc_sitekey order by hubloc_connected desc limit 1");
}
else {
- $r = q("select hubloc_guid, hubloc_sitekey, hubloc_network, hubloc_flags, hubloc_callback, hubloc_host from hubloc
+ $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");
}