Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "ImportableOldRevisionImporter: Don't call WikiPage::updateIfNewerOn"

Browse source
This commit is contained in:
jenkins-bot 2020-06-15 21:59:31 +00:00 committed by Gerrit Code Review
commit abfc45cd87
1 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
includes/import/ImportableOldRevisionImporter.php
View file

@ -2,6 +2,7 @@
use MediaWiki\MediaWikiServices;
use MediaWiki\Revision\MutableRevisionRecord;
use MediaWiki\Revision\RevisionStore;
use MediaWiki\Revision\SlotRecord;
use Psr\Log\LoggerInterface;
use Wikimedia\Rdbms\ILoadBalancer;
@ -137,14 +138,25 @@ class ImportableOldRevisionImporter implements OldRevisionImporter {
$revisionRecord->setMinorEdit( $importableRevision->getMinor() );
$revisionRecord->setPageId( $pageId );
$inserted = MediaWikiServices::getInstance()
->getRevisionStore()
->insertRevisionOn( $revisionRecord, $dbw );
$latestRevId = $page->getLatest();
$revObject = new Revision( $inserted );
// TODO WikiPage::updateIfNewerOn is deprecated
$changed = $page->updateIfNewerOn( $dbw, $revObject );
$revisionStore = MediaWikiServices::getInstance()->getRevisionStore();
$inserted = $revisionStore->insertRevisionOn( $revisionRecord, $dbw );
if ( $latestRevId ) {
// If not found (false), cast to 0 so that the page is updated
// Just to be on the safe side, even though it should always be found
$latestRevTimestamp = (int)$revisionStore->getTimestampFromId(
$latestRevId,
RevisionStore::READ_LATEST
);
} else {
$latestRevTimestamp = 0;
}
if ( $importableRevision->getTimestamp() > $latestRevTimestamp ) {
$changed = $page->updateRevisionOn( $dbw, $inserted, $latestRevId );
} else {
$changed = false;
}
$tags = $importableRevision->getTags();
if ( $tags !== [] ) {
@ -154,7 +166,8 @@ class ImportableOldRevisionImporter implements OldRevisionImporter {
if ( $changed !== false && $this->doUpdates ) {
$this->logger->debug( __METHOD__ . ": running updates" );
// countable/oldcountable stuff is handled in WikiImporter::finishImportPage
// TODO WikiPgae::doEditUpdates is deprecated
// TODO WikiPage::doEditUpdates is deprecated
$revObject = new Revision( $inserted );
$page->doEditUpdates(
$revObject,
$user,