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

EditPage: Remove checks for false contentModel

Browse source 
contentModel should always have a value here.

Change-Id: I38ab7211d63ec8b729965e8eefef4ed330f7b1f9
This commit is contained in:
addshore 2017-01-26 19:30:28 +01:00 committed by Addshore
parent abc5543c06
commit 49aa4cf14c
1 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
includes/EditPage.php
View file

@ -363,8 +363,8 @@ class EditPage {
/** @var bool */
public $bot = true;
/** @var null|string */
public $contentModel = null;
/** @var string */
public $contentModel;
/** @var null|string */
public $contentFormat = null;
@ -1255,11 +1255,7 @@ class EditPage {
}
$revision = $this->mArticle->getRevisionFetched();
if ( $revision === null ) {
if ( !$this->contentModel ) {
throw new RuntimeException( 'EditPage contentModel was false' );
}
$handler = ContentHandler::getForModelID( $this->contentModel );
return $handler->makeEmptyContent();
}
$content = $revision->getContent( Revision::FOR_THIS_USER, $user );
@ -1299,11 +1295,7 @@ class EditPage {
$content = $rev ? $rev->getContent( Revision::RAW ) : null;
if ( $content === false || $content === null ) {
if ( !$this->contentModel ) {
throw new RuntimeException( 'EditPage contentModel was false' );
}
$handler = ContentHandler::getForModelID( $this->contentModel );
return $handler->makeEmptyContent();
} elseif ( !$this->undidRev ) {
// Content models should always be the same since we error