X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Fimport%2FImportableOldRevisionImporter.php;h=066a3eacef53450cece481984bd8382ecf5b9395;hp=33fad3e62693ff3685d204428852d9721e1cc8b7;hb=aa54a4caa3d592bcae9f44549a46cd655388b79b;hpb=a7e2b91b2c72f3522a7a9c3c957a43309e70b92e diff --git a/includes/import/ImportableOldRevisionImporter.php b/includes/import/ImportableOldRevisionImporter.php index 33fad3e626..066a3eacef 100644 --- a/includes/import/ImportableOldRevisionImporter.php +++ b/includes/import/ImportableOldRevisionImporter.php @@ -68,18 +68,20 @@ class ImportableOldRevisionImporter implements OldRevisionImporter { // Note: sha1 has been in XML dumps since 2012. If you have an // older dump, the duplicate detection here won't work. - $prior = $dbw->selectField( 'revision', '1', - [ 'rev_page' => $pageId, + if ( $importableRevision->getSha1Base36() !== false ) { + $prior = $dbw->selectField( 'revision', '1', + [ 'rev_page' => $pageId, 'rev_timestamp' => $dbw->timestamp( $importableRevision->getTimestamp() ), 'rev_sha1' => $importableRevision->getSha1Base36() ], - __METHOD__ - ); - if ( $prior ) { - // @todo FIXME: This could fail slightly for multiple matches :P - $this->logger->debug( __METHOD__ . ": skipping existing revision for [[" . - $importableRevision->getTitle()->getPrefixedText() . "]], timestamp " . - $importableRevision->getTimestamp() . "\n" ); - return false; + __METHOD__ + ); + if ( $prior ) { + // @todo FIXME: This could fail slightly for multiple matches :P + $this->logger->debug( __METHOD__ . ": skipping existing revision for [[" . + $importableRevision->getTitle()->getPrefixedText() . "]], timestamp " . + $importableRevision->getTimestamp() . "\n" ); + return false; + } } }