diff options
| author | friendica <info@friendica.com> | 2012-03-07 18:23:55 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-03-07 18:23:55 -0800 |
| commit | 395a9530dcbca95b2f2c7dde9df21ee1981fa19f (patch) | |
| tree | 916466abe6ad95f256bfc102a519513d50984fcc /include | |
| parent | 6525507a2f6a6b8f81e85a597cfa99f9f8c90279 (diff) | |
| download | volse-hubzilla-395a9530dcbca95b2f2c7dde9df21ee1981fa19f.tar.gz volse-hubzilla-395a9530dcbca95b2f2c7dde9df21ee1981fa19f.tar.bz2 volse-hubzilla-395a9530dcbca95b2f2c7dde9df21ee1981fa19f.zip | |
still getting parent relays on remote systems
Diffstat (limited to 'include')
| -rwxr-xr-x | include/items.php | 4 | ||||
| -rwxr-xr-x | include/notifier.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/items.php b/include/items.php index fdff6b642..1a7aa6c46 100755 --- a/include/items.php +++ b/include/items.php @@ -1756,7 +1756,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0) $datarray['uid'] = $importer['uid']; $datarray['contact-id'] = $contact['id']; - if(x($datarray,'owner-link') && strlen($datarray['owner-link']) && (! link_compare($datarray['owner-link'],$contact['url']))) { + if(! link_compare($datarray['owner-link'],$contact['url'])) { // The item owner info is not our contact. It's OK and is to be expected if this is a tgroup delivery, // but otherwise there's a possible data mixup on the sender's system. // the tgroup delivery code called from item_store will correct it if it's a forum, @@ -2477,7 +2477,7 @@ function local_delivery($importer,$data) { $datarray['uid'] = $importer['importer_uid']; $datarray['contact-id'] = $importer['id']; - if(x($datarray,'owner-link') && strlen($datarray['owner-link']) && (! link_compare($datarray['owner-link'],$importer['url']))) { + if(! link_compare($datarray['owner-link'],$contact['url'])) { // The item owner info is not our contact. It's OK and is to be expected if this is a tgroup delivery, // but otherwise there's a possible data mixup on the sender's system. // the tgroup delivery code called from item_store will correct it if it's a forum, diff --git a/include/notifier.php b/include/notifier.php index 4765cca06..5b23406fc 100755 --- a/include/notifier.php +++ b/include/notifier.php @@ -201,7 +201,7 @@ function notifier_run($argv, $argc){ // by stringing togther an array of retractions and sending them onward. - $localhost = $a->get_hostname(); + $localhost = str_replace('www.','',$a->get_hostname()); if(strpos($localhost,':')) $localhost = substr($localhost,0,strpos($localhost,':')); |