aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-01-04 17:04:44 -0800
committerfriendica <info@friendica.com>2013-01-04 17:04:44 -0800
commit816383a9c3aabf3e85d434a2258063ce391e89ac (patch)
treeb0f7ff559624f0d69dcec1ed17325ec9b4a84015 /include
parent37a4afa2ffc0b19c21bde62ed1ed0c30b64cf7ee (diff)
downloadvolse-hubzilla-816383a9c3aabf3e85d434a2258063ce391e89ac.tar.gz
volse-hubzilla-816383a9c3aabf3e85d434a2258063ce391e89ac.tar.bz2
volse-hubzilla-816383a9c3aabf3e85d434a2258063ce391e89ac.zip
This should fix the errant relaying...
Diffstat (limited to 'include')
-rw-r--r--include/notifier.php8
1 files changed, 6 insertions, 2 deletions
diff --git a/include/notifier.php b/include/notifier.php
index aff3c5366..26b773d8e 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -228,8 +228,12 @@ function notifier_run($argv, $argc){
// $cmd === 'relay' indicates the owner is sending it to the original recipients
// don't allow the item in the relay command to relay to owner under any circumstances, it will loop
+ logger('notifier: relay_to_owner: ' . (($relay_to_owner) ? 'true' : 'false'));
+ logger('notifier: top_level_post: ' . (($top_level_post) ? 'true' : 'false'));
+ logger('notifier: target_item_flags: ' . $target_item['item_flags'] . ' ' . (($target_item['item_flags'] & ITEM_ORIGIN ) ? 'true' : 'false'));
- if(($relay_to_owner) && (! $cmd === 'relay')) {
+
+ if(($relay_to_owner) && ($cmd !== 'relay')) {
logger('notifier: followup relay', LOGGER_DEBUG);
$recipients = array($parent_item['owner_xchan']);
$private = true;
@@ -284,7 +288,7 @@ function notifier_run($argv, $argc){
// for public posts always include our own hub
- $sql_extra = (($private) ? "" : " or hubloc_url = " . z_root() . " ");
+ $sql_extra = (($private) ? "" : " or hubloc_url = '" . z_root() . "' ");
$r = q("select distinct(hubloc_callback),hubloc_host,hubloc_sitekey from hubloc
where hubloc_hash in (" . implode(',',$recipients) . ") $sql_extra group by hubloc_callback");