aboutsummaryrefslogtreecommitdiffstats
path: root/include/notifier.php
diff options
context:
space:
mode:
authortuscanhobbit <tuscanhobbit@users.noreply.github.com>2014-09-28 23:17:47 +0200
committertuscanhobbit <tuscanhobbit@users.noreply.github.com>2014-09-28 23:17:47 +0200
commitf104dc840c79f4ea666a85033bffbf4a33d06f4e (patch)
treef1fce3898b757e3a29e928cc1afe724edb620471 /include/notifier.php
parent6e141a8a53ba6cb7d91b989985744fdcd3d6f13d (diff)
parenteaf96f987a5f22a54fdbb4cedef52b0159a37ad0 (diff)
downloadvolse-hubzilla-f104dc840c79f4ea666a85033bffbf4a33d06f4e.tar.gz
volse-hubzilla-f104dc840c79f4ea666a85033bffbf4a33d06f4e.tar.bz2
volse-hubzilla-f104dc840c79f4ea666a85033bffbf4a33d06f4e.zip
Merge from origin
Diffstat (limited to 'include/notifier.php')
-rw-r--r--include/notifier.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/notifier.php b/include/notifier.php
index 0c7a15452..79a6886ad 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -158,7 +158,7 @@ function notifier_run($argv, $argc){
$message = q("SELECT * FROM `mail` WHERE `id` = %d LIMIT 1",
intval($item_id)
);
- if(! count($message)){
+ if(! $message) {
return;
}
xchan_mail_query($message[0]);
@@ -477,11 +477,13 @@ function notifier_run($argv, $argc){
where hubloc_hash in (" . implode(',',$recipients) . ") group by hubloc_sitekey order by hubloc_connected desc limit 1");
}
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) . ") and not (hubloc_flags & %d) and not (hubloc_status & %d) group by hubloc_sitekey",
intval(HUBLOC_FLAGS_DELETED),
intval(HUBLOC_OFFLINE)
);
+
}
if(! $r) {