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 "Change 1.26 to 1.27, mostly in doc comments"
[lhc/web/wiklou.git]
/
includes
/
specials
/
SpecialMovepage.php
diff --git
a/includes/specials/SpecialMovepage.php
b/includes/specials/SpecialMovepage.php
index
aa71d3c
..
589c39f
100644
(file)
--- a/
includes/specials/SpecialMovepage.php
+++ b/
includes/specials/SpecialMovepage.php
@@
-142,8
+142,6
@@
class MovePageForm extends UnlistedSpecialPage {
$this->getSkin()->setRelevantTitle( $this->oldTitle );
$this->getSkin()->setRelevantTitle( $this->oldTitle );
- $oldTitleLink = Linker::link( $this->oldTitle );
-
$out = $this->getOutput();
$out->setPageTitle( $this->msg( 'move-page', $this->oldTitle->getPrefixedText() ) );
$out->addModules( 'mediawiki.special.movePage' );
$out = $this->getOutput();
$out->setPageTitle( $this->msg( 'move-page', $this->oldTitle->getPrefixedText() ) );
$out->addModules( 'mediawiki.special.movePage' );
@@
-230,10
+228,6
@@
class MovePageForm extends UnlistedSpecialPage {
$hasRedirects = false;
}
$hasRedirects = false;
}
- if ( $considerTalk ) {
- $out->addWikiMsg( 'movepagetalktext' );
- }
-
if ( count( $err ) ) {
$out->addHTML( "<div class='error'>\n" );
$action_desc = $this->msg( 'action-move' )->plain();
if ( count( $err ) ) {
$out->addHTML( "<div class='error'>\n" );
$action_desc = $this->msg( 'action-move' )->plain();
@@
-302,16
+296,6
@@
class MovePageForm extends UnlistedSpecialPage {
$out->enableOOUI();
$fields = array();
$out->enableOOUI();
$fields = array();
- $fields[] = new OOUI\FieldLayout(
- new OOUI\LabelWidget( array(
- 'label' => new OOUI\HtmlSnippet( "<strong>$oldTitleLink</strong>" )
- ) ),
- array(
- 'label' => $this->msg( 'movearticle' )->text(),
- 'align' => 'top',
- )
- );
-
$fields[] = new OOUI\FieldLayout(
new MediaWiki\Widget\ComplexTitleInputWidget( array(
'id' => 'wpNewTitle',
$fields[] = new OOUI\FieldLayout(
new MediaWiki\Widget\ComplexTitleInputWidget( array(
'id' => 'wpNewTitle',
@@
-360,7
+344,9
@@
class MovePageForm extends UnlistedSpecialPage {
) ),
array(
'label' => $this->msg( 'movetalk' )->text(),
) ),
array(
'label' => $this->msg( 'movetalk' )->text(),
+ 'help' => new OOUI\HtmlSnippet( $this->msg( 'movepagetalktext' )->parseAsBlock() ),
'align' => 'inline',
'align' => 'inline',
+ 'infusable' => true,
)
);
}
)
);
}