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
merging latest master
[lhc/web/wiklou.git]
/
includes
/
specials
/
SpecialBlock.php
diff --git
a/includes/specials/SpecialBlock.php
b/includes/specials/SpecialBlock.php
index
3c43ed1
..
b6484ce
100644
(file)
--- a/
includes/specials/SpecialBlock.php
+++ b/
includes/specials/SpecialBlock.php
@@
-144,6
+144,7
@@
class SpecialBlock extends FormSpecialPage {
'tabindex' => '2',
'options' => self::getSuggestedDurations(),
'other' => $this->msg( 'ipbother' )->text(),
'tabindex' => '2',
'options' => self::getSuggestedDurations(),
'other' => $this->msg( 'ipbother' )->text(),
+ 'default' => $this->msg( 'ipb-default-expiry' )->inContentLanguage()->text(),
),
'Reason' => array(
'type' => 'selectandother',
),
'Reason' => array(
'type' => 'selectandother',
@@
-271,7
+272,7
@@
class SpecialBlock extends FormSpecialPage {
}
if( $block->mExpiry == 'infinity' ) {
}
if( $block->mExpiry == 'infinity' ) {
- $fields['Expiry']['default'] = 'in
de
finite';
+ $fields['Expiry']['default'] = 'infinite';
} else {
$fields['Expiry']['default'] = wfTimestamp( TS_RFC2822, $block->mExpiry );
}
} else {
$fields['Expiry']['default'] = wfTimestamp( TS_RFC2822, $block->mExpiry );
}
@@
-300,6
+301,8
@@
class SpecialBlock extends FormSpecialPage {
* @return String
*/
protected function preText(){
* @return String
*/
protected function preText(){
+ $this->getOutput()->addModules( 'mediawiki.special.block' );
+
$text = $this->msg( 'blockiptext' )->parse();
$otherBlockMessages = array();
$text = $this->msg( 'blockiptext' )->parse();
$otherBlockMessages = array();