dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "generatePhpCharToUpperMappings: Die if fopen fails"
[lhc/web/wiklou.git]
/
includes
/
EditPage.php
diff --git
a/includes/EditPage.php
b/includes/EditPage.php
index
c346b75
..
d047f6e
100644
(file)
--- 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\EditPage\TextConflictHelper;
use MediaWiki\Logger\LoggerFactory;
use MediaWiki\MediaWikiServices;
-use MediaWiki\
Storage
\RevisionRecord;
+use MediaWiki\
Revision
\RevisionRecord;
use Wikimedia\ScopedCallback;
/**
use Wikimedia\ScopedCallback;
/**
@@
-2742,7
+2742,7
@@
ERROR;
* content.
*
* @param Content|null|bool|string $content
* 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.
*
* @throws MWException If $content is not an instance of TextContent and
* $this->allowNonTextContent is not true.
@@
-4045,11
+4045,11
@@
ERROR;
if ( $this->isConflict ) {
$conflict = Html::rawElement(
if ( $this->isConflict ) {
$conflict = Html::rawElement(
- '
h2', [ 'id' => 'mw-previewconflict
' ],
+ '
div', [ 'id' => 'mw-previewconflict', 'class' => 'warningbox
' ],
$this->context->msg( 'previewconflict' )->escaped()
);
} else {
$this->context->msg( 'previewconflict' )->escaped()
);
} else {
- $conflict = '
<hr />
';
+ $conflict = '';
}
$previewhead = Html::rawElement(
}
$previewhead = Html::rawElement(
@@
-4058,7
+4058,9
@@
ERROR;
'h2', [ 'id' => 'mw-previewheader' ],
$this->context->msg( 'preview' )->escaped()
) .
'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();
);
$pageViewLang = $this->mTitle->getPageViewLanguage();