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 "localisation: Remove PHP5-specific perf optimisation"
[lhc/web/wiklou.git]
/
includes
/
EditPage.php
diff --git
a/includes/EditPage.php
b/includes/EditPage.php
index
23d6ef9
..
9182300
100644
(file)
--- a/
includes/EditPage.php
+++ b/
includes/EditPage.php
@@
-1156,7
+1156,7
@@
class EditPage {
$out->showErrorPage(
'modeleditnotsupported-title',
'modeleditnotsupported-text',
$out->showErrorPage(
'modeleditnotsupported-title',
'modeleditnotsupported-text',
- $modelName
+ [ $modelName ]
);
return false;
}
);
return false;
}
@@
-1188,7
+1188,7
@@
class EditPage {
/**
* @param Content|null $def_content The default value to return
*
/**
* @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
*/
*
* @since 1.21
*/
@@
-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();