diff options
| author | Alexander Kampmann <programmer@nurfuerspam.de> | 2012-03-09 12:17:19 +0100 |
|---|---|---|
| committer | Alexander Kampmann <programmer@nurfuerspam.de> | 2012-03-09 12:17:19 +0100 |
| commit | af34cf019c5742abadab19586f3931353d8d3ff8 (patch) | |
| tree | e788b55ff2bbe256d62e517d04ef25e8630313b3 /include/items.php | |
| parent | f84c191f8df126b95d8a41f70e785a9592018390 (diff) | |
| parent | 42d622d6bfb5768205573cb6b149340d28f46886 (diff) | |
| download | volse-hubzilla-af34cf019c5742abadab19586f3931353d8d3ff8.tar.gz volse-hubzilla-af34cf019c5742abadab19586f3931353d8d3ff8.tar.bz2 volse-hubzilla-af34cf019c5742abadab19586f3931353d8d3ff8.zip | |
Merge branch 'master' of git://github.com/friendica/friendica
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, |