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 "SpecialUnusedimages: Change message when CountCategorizedImagesAsUsed"
[lhc/web/wiklou.git]
/
includes
/
specials
/
SpecialImport.php
diff --git
a/includes/specials/SpecialImport.php
b/includes/specials/SpecialImport.php
index
3ef64f8
..
a985bcc
100644
(file)
--- a/
includes/specials/SpecialImport.php
+++ b/
includes/specials/SpecialImport.php
@@
-179,8
+179,9
@@
class SpecialImport extends SpecialPage {
$out = $this->getOutput();
if ( !$source->isGood() ) {
$out = $this->getOutput();
if ( !$source->isGood() ) {
- $out->addWikiText( "<p class=\"error\">\n" .
- $this->msg( 'importfailed', $source->getWikiText() )->parse() . "\n</p>" );
+ $out->wrapWikiTextAsInterface( 'error',
+ $this->msg( 'importfailed', $source->getWikiText() )->plain()
+ );
} else {
$importer = new WikiImporter( $source->value, $this->getConfig() );
if ( !is_null( $this->namespace ) ) {
} else {
$importer = new WikiImporter( $source->value, $this->getConfig() );
if ( !is_null( $this->namespace ) ) {
@@
-189,7
+190,7
@@
class SpecialImport extends SpecialPage {
$statusRootPage = $importer->setTargetRootPage( $this->rootpage );
if ( !$statusRootPage->isGood() ) {
$out->wrapWikiMsg(
$statusRootPage = $importer->setTargetRootPage( $this->rootpage );
if ( !$statusRootPage->isGood() ) {
$out->wrapWikiMsg(
- "<
p class=\"error\">\n$1\n</p
>",
+ "<
div class=\"error\">\n$1\n</div
>",
[
'import-options-wrong',
$statusRootPage->getWikiText(),
[
'import-options-wrong',
$statusRootPage->getWikiText(),
@@
-224,13
+225,13
@@
class SpecialImport extends SpecialPage {
if ( $exception ) {
# No source or XML parse error
$out->wrapWikiMsg(
if ( $exception ) {
# No source or XML parse error
$out->wrapWikiMsg(
- "<
p class=\"error\">\n$1\n</p
>",
+ "<
div class=\"error\">\n$1\n</div
>",
[ 'importfailed', $exception->getMessage() ]
);
} elseif ( !$result->isGood() ) {
# Zero revisions
$out->wrapWikiMsg(
[ 'importfailed', $exception->getMessage() ]
);
} elseif ( !$result->isGood() ) {
# Zero revisions
$out->wrapWikiMsg(
- "<
p class=\"error\">\n$1\n</p
>",
+ "<
div class=\"error\">\n$1\n</div
>",
[ 'importfailed', $result->getWikiText() ]
);
} else {
[ 'importfailed', $result->getWikiText() ]
);
} else {
@@
-279,6
+280,7
@@
class SpecialImport extends SpecialPage {
'selected' => ( $isSameSourceAsBefore ?
$this->namespace :
( $defaultNamespace || '' ) ),
'selected' => ( $isSameSourceAsBefore ?
$this->namespace :
( $defaultNamespace || '' ) ),
+ 'in-user-lang' => true,
], [
'name' => "namespace",
// mw-import-namespace-interwiki, mw-import-namespace-upload
], [
'name' => "namespace",
// mw-import-namespace-interwiki, mw-import-namespace-upload