X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FEditPage.php;h=9182300fcf35643a762a98e7cc27fbdd5ed5889e;hb=0eb97872a54229f5c9892a1202882997a50d7e37;hp=6ae4371a104b5fc5a0fc24b5aeb9a60b92aa6c47;hpb=824469f51cc1c159130bd4eddcf98cbf528798b6;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 6ae4371a10..9182300fcf 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -25,7 +25,7 @@ use MediaWiki\EditPage\TextboxBuilder;
 use MediaWiki\EditPage\TextConflictHelper;
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MediaWikiServices;
-use MediaWiki\Storage\RevisionRecord;
+use MediaWiki\Revision\RevisionRecord;
 use Wikimedia\ScopedCallback;
 
 /**
@@ -1156,7 +1156,7 @@ class EditPage {
 			$out->showErrorPage(
 				'modeleditnotsupported-title',
 				'modeleditnotsupported-text',
-				$modelName
+				[ $modelName ]
 			);
 			return false;
 		}
@@ -1188,11 +1188,13 @@ class EditPage {
 	/**
 	 * @param Content|null $def_content The default value to return
 	 *
-	 * @return Content|null Content on success, $def_content for invalid sections
+	 * @return Content|false|null Content on success, $def_content for invalid sections
 	 *
 	 * @since 1.21
 	 */
 	protected function getContentObject( $def_content = null ) {
+		global $wgDisableAnonTalk;
+
 		$content = false;
 
 		$user = $this->context->getUser();
@@ -1292,8 +1294,11 @@ class EditPage {
 										$undo
 									)->inContentLanguage()->text();
 								} else {
+									$undoMessage = ( $undorev->getUser() === 0 && $wgDisableAnonTalk ) ?
+										'undo-summary-anon' :
+										'undo-summary';
 									$undoSummary = $this->context->msg(
-										'undo-summary',
+										$undoMessage,
 										$undo,
 										$userText
 									)->inContentLanguage()->text();
@@ -2737,7 +2742,7 @@ ERROR;
 	 * content.
 	 *
 	 * @param Content|null|bool|string $content
-	 * @return string The editable text form of the content.
+	 * @return string|false|null The editable text form of the content.
 	 *
 	 * @throws MWException If $content is not an instance of TextContent and
 	 *   $this->allowNonTextContent is not true.
@@ -4040,11 +4045,11 @@ ERROR;
 
 		if ( $this->isConflict ) {
 			$conflict = Html::rawElement(
-				'h2', [ 'id' => 'mw-previewconflict' ],
+				'div', [ 'id' => 'mw-previewconflict', 'class' => 'warningbox' ],
 				$this->context->msg( 'previewconflict' )->escaped()
 			);
 		} else {
-			$conflict = '<hr />';
+			$conflict = '';
 		}
 
 		$previewhead = Html::rawElement(
@@ -4053,7 +4058,9 @@ ERROR;
 				'h2', [ 'id' => 'mw-previewheader' ],
 				$this->context->msg( 'preview' )->escaped()
 			) .
-			$out->parseAsInterface( $note ) . $conflict
+			Html::rawElement( 'div', [ 'class' => 'warningbox' ],
+				$out->parseAsInterface( $note )
+			) . $conflict
 		);
 
 		$pageViewLang = $this->mTitle->getPageViewLanguage();