X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/comptes/ajouter.php?a=blobdiff_plain;f=includes%2FEditPage.php;h=7a5832609c0114348baf5b1a42f34c6a25b5c3e3;hb=3605066c9612acb86ea69fc1e5bfecc4cc04f5da;hp=a02392e2ebbaaee77b2b9c9862103d76174b8c64;hpb=32b80f38ffc0baeabfff203bd6095a844da31048;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/EditPage.php b/includes/EditPage.php
index a02392e2eb..7a5832609c 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -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
@@ -2326,12 +2318,9 @@ class EditPage {
 	}
 
 	public function setHeaders() {
-		global $wgOut, $wgUser, $wgAjaxEditStash, $wgCookieSetOnAutoblock;
+		global $wgOut, $wgUser, $wgAjaxEditStash;
 
 		$wgOut->addModules( 'mediawiki.action.edit' );
-		if ( $wgCookieSetOnAutoblock === true ) {
-			$wgOut->addModules( 'mediawiki.user.blockcookie' );
-		}
 		$wgOut->addModuleStyles( 'mediawiki.action.edit.styles' );
 
 		if ( $wgUser->getOption( 'showtoolbar' ) ) {