diff options
| author | Thomas <rat@rlyeh-military-affairs> | 2012-03-09 01:50:51 +0000 |
|---|---|---|
| committer | Thomas <rat@rlyeh-military-affairs> | 2012-03-09 01:50:51 +0000 |
| commit | eb84a22da749264fa79829d27471002d9f1e287f (patch) | |
| tree | 3f06ec010f13484dd50eceb7ca7f58e96b4e8847 /include/items.php | |
| parent | 6ae5962b009cfd88925eae721e24bf895e8b78d5 (diff) | |
| parent | b86a08166cf0db891392b2877c290231a3143238 (diff) | |
| download | volse-hubzilla-eb84a22da749264fa79829d27471002d9f1e287f.tar.gz volse-hubzilla-eb84a22da749264fa79829d27471002d9f1e287f.tar.bz2 volse-hubzilla-eb84a22da749264fa79829d27471002d9f1e287f.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/items.php')
| -rwxr-xr-x | include/items.php | 4 |
1 files changed, 2 insertions, 2 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, |