use MediaWiki\EditPage\TextConflictHelper;
use MediaWiki\Logger\LoggerFactory;
use MediaWiki\MediaWikiServices;
-use MediaWiki\Storage\RevisionRecord;
+use MediaWiki\Revision\RevisionRecord;
use Wikimedia\ScopedCallback;
/**
/**
* @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
*/
* 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.
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(
'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();