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

Remove use of deprecated Revision from ApiStashEdit

Browse source 
Bug: T246284
Change-Id: I734e6572c913f4f32295a14705f0fc19b8000b03
This commit is contained in:
Petr Pchelko 2020-03-03 23:31:59 -08:00
parent 61c7613540
commit e2443a7066
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
includes/api/ApiStashEdit.php
View file

@ -20,6 +20,7 @@
use MediaWiki\Content\IContentHandlerFactory;
use MediaWiki\MediaWikiServices;
use MediaWiki\Revision\SlotRecord;
use MediaWiki\Storage\PageEditStash;
/**
@ -91,11 +92,13 @@ class ApiStashEdit extends ApiBase {
$page = WikiPage::factory( $title );
if ( $page->exists() ) {
// Page exists: get the merged content with the proposed change
$baseRev = Revision::newFromPageId( $page->getId(), $params['baserevid'] );
$baseRev = MediaWikiServices::getInstance()
->getRevisionLookup()
->getRevisionByPageId( $page->getId(), $params['baserevid'] );
if ( !$baseRev ) {
$this->dieWithError( [ 'apierror-nosuchrevid', $params['baserevid'] ] );
}
$currentRev = $page->getRevision();
$currentRev = $page->getRevisionRecord();
if ( !$currentRev ) {
$this->dieWithError( [ 'apierror-missingrev-pageid', $page->getId() ], 'missingrev' );
}
@ -114,8 +117,8 @@ class ApiStashEdit extends ApiBase {
$content = $editContent;
} else {
// Merge the edit into the current version
$baseContent = $baseRev->getContent();
$currentContent = $currentRev->getContent();
$baseContent = $baseRev->getContent( SlotRecord::MAIN );
$currentContent = $currentRev->getContent( SlotRecord::MAIN );
if ( !$baseContent || !$currentContent ) {
$this->dieWithError( [ 'apierror-missingcontent-pageid', $page->getId() ], 'missingrev' );
}