Merge pull request #4430 from annando/import-check

Bugfix for check that the DFRN entry already exists
This commit is contained in:
Tobias Diekershoff 2018-02-09 07:31:04 +01:00 committed by GitHub
commit 1a8851ac38
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -2411,10 +2411,8 @@ class DFRN
);
// Is there an existing item?
if (DBM::is_result($current) && self::isEditedTimestampNewer($current[0], $item)
&& (DateTimeFormat::utc($item["edited"]) < $current[0]["edited"])
) {
logger("Item ".$item["uri"]." already existed.", LOGGER_DEBUG);
if (DBM::is_result($current) && !self::isEditedTimestampNewer($current[0], $item)) {
logger("Item ".$item["uri"]." already existed in this version.", LOGGER_DEBUG);
return;
}