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

ImportableOldRevisionImporter: Remove use of Revision::insertOn

Browse source 
Bug: T251856
Change-Id: Ie1764d5d8f8711eb0c7792be307728e3042fc444
This commit is contained in:
DannyS712 2020-05-05 08:50:22 +00:00
parent 9fb14c42aa
commit 3c293332ea
1 changed files with 36 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
includes/import/ImportableOldRevisionImporter.php
View file

@ -1,5 +1,8 @@
<?php
use MediaWiki\MediaWikiServices;
use MediaWiki\Revision\MutableRevisionRecord;
use MediaWiki\Revision\SlotRecord;
use Psr\Log\LoggerInterface;
use Wikimedia\Rdbms\ILoadBalancer;
@ -112,33 +115,48 @@ class ImportableOldRevisionImporter implements OldRevisionImporter {
# @todo FIXME: Use original rev_id optionally (better for backups)
# Insert the row
$revision = new Revision( [
'title' => $importableRevision->getTitle(),
'page' => $pageId,
'content_model' => $importableRevision->getModel(),
'content_format' => $importableRevision->getFormat(),
// XXX: just set 'content' => $wikiRevision->getContent()?
'text' => $importableRevision->getContent()->serialize( $importableRevision->getFormat() ),
'comment' => $importableRevision->getComment(),
'user' => $userId,
'user_text' => $userText,
'timestamp' => $importableRevision->getTimestamp(),
'minor_edit' => $importableRevision->getMinor(),
'parent_id' => $prevId,
] );
$revision->insertOn( $dbw );
$changed = $page->updateIfNewerOn( $dbw, $revision );
$revisionRecord = new MutableRevisionRecord( $importableRevision->getTitle() );
$revisionRecord->setParentId( (int)$prevId );
$revisionRecord->setComment(
CommentStoreComment::newUnsavedComment( $importableRevision->getComment() )
);
try {
$revUser = User::newFromAnyId(
$userId,
$userText,
null
);
} catch ( InvalidArgumentException $ex ) {
$revUser = RequestContext::getMain()->getUser();
}
$revisionRecord->setUser( $revUser );
$revisionRecord->setContent( SlotRecord::MAIN, $importableRevision->getContent() );
$revisionRecord->setTimestamp( $importableRevision->getTimestamp() );
$revisionRecord->setMinorEdit( $importableRevision->getMinor() );
$revisionRecord->setPageId( $pageId );
$inserted = MediaWikiServices::getInstance()
->getRevisionStore()
->insertRevisionOn( $revisionRecord, $dbw );
$revObject = new Revision( $inserted );
// TODO WikiPage::updateIfNewerOn is deprecated
$changed = $page->updateIfNewerOn( $dbw, $revObject );
$tags = $importableRevision->getTags();
if ( $tags !== [] ) {
ChangeTags::addTags( $tags, null, $revision->getId() );
ChangeTags::addTags( $tags, null, $inserted->getId() );
}
if ( $changed !== false && $this->doUpdates ) {
$this->logger->debug( __METHOD__ . ": running updates\n" );
// countable/oldcountable stuff is handled in WikiImporter::finishImportPage
// TODO WikiPgae::doEditUpdates is deprecated
$page->doEditUpdates(
$revision,
$revObject,
$user,
[ 'created' => $created, 'oldcountable' => 'no-change' ]
);