Merge "(bug 39793) #simpleSearch placeholder styles for Firefox, IE"

[lhc/web/wiklou.git] / includes / specials / SpecialBlockList.php

diff --git a/includes/specials/SpecialBlockList.php b/includes/specials/SpecialBlockList.php
index 719a338..7143d5b 100644 (file)
--- a/includes/specials/SpecialBlockList.php
+++ b/includes/specials/SpecialBlockList.php
@@ -74,10 +74,10 @@ class SpecialBlockList extends SpecialPage {
                        'Options' => array(
                                'type' => 'multiselect',
                                'options' => array(
-                                       wfMsg( 'blocklist-userblocks' ) => 'userblocks',
-                                       wfMsg( 'blocklist-tempblocks' ) => 'tempblocks',
-                                       wfMsg( 'blocklist-addressblocks' ) => 'addressblocks',
-                                       wfMsg( 'blocklist-rangeblocks' ) => 'rangeblocks',
+                                       $this->msg( 'blocklist-userblocks' )->text() => 'userblocks',
+                                       $this->msg( 'blocklist-tempblocks' )->text() => 'tempblocks',
+                                       $this->msg( 'blocklist-addressblocks' )->text() => 'addressblocks',
+                                       $this->msg( 'blocklist-rangeblocks' )->text() => 'rangeblocks',
                                ),
                                'flatlist' => true,
                        ),
@@ -97,8 +97,8 @@ class SpecialBlockList extends SpecialPage {
                );
                $form = new HTMLForm( $fields, $this->getContext() );
                $form->setMethod( 'get' );
-               $form->setWrapperLegend( wfMsg( 'ipblocklist-legend' ) );
-               $form->setSubmitText( wfMsg( 'ipblocklist-submit' ) );
+               $form->setWrapperLegendMsg( 'ipblocklist-legend' );
+               $form->setSubmitTextMsg( 'ipblocklist-submit' );
                $form->prepareForm();
 
                $form->displayForm( '' );
@@ -171,7 +171,7 @@ class SpecialBlockList extends SpecialPage {
                # Not necessary in a standard installation without such extensions enabled
                if( count( $otherBlockLink ) ) {
                        $out->addHTML(
-                               Html::rawElement( 'h2', array(), wfMsg( 'ipblocklist-localblock' ) ) . "\n"
+                               Html::element( 'h2', array(), $this->msg( 'ipblocklist-localblock' )->text() ) . "\n"
                        );
                }
 
@@ -195,11 +195,7 @@ class SpecialBlockList extends SpecialPage {
                                Html::rawElement(
                                        'h2',
                                        array(),
-                                       wfMsgExt(
-                                               'ipblocklist-otherblocks',
-                                               'parseinline',
-                                               count( $otherBlockLink )
-                                       )
+                                       $this->msg( 'ipblocklist-otherblocks', count( $otherBlockLink ) )->parse()
                                ) . "\n"
                        );
                        $list = '';
@@ -238,7 +234,9 @@ class BlockListPager extends TablePager {
                                'ipb_params' => 'blocklist-params',
                                'ipb_reason' => 'blocklist-reason',
                        );
-                       $headers = array_map( 'wfMsg', $headers );
+                       foreach( $headers as $key => $val ) {
+                               $headers[$key] = $this->msg( $val )->text();
+                       }
                }
 
                return $headers;
@@ -257,7 +255,7 @@ class BlockListPager extends TablePager {
                                'change-blocklink',
                                'infiniteblock',
                        );
-                       $msg = array_combine( $msg, array_map( 'wfMessage', $msg ) );
+                       $msg = array_combine( $msg, array_map( array( $this, 'msg' ), $msg ) );
                }
 
                /** @var $row object */
@@ -267,12 +265,12 @@ class BlockListPager extends TablePager {
 
                switch( $name ) {
                        case 'ipb_timestamp':
-                               $formatted = $this->getLanguage()->timeanddate( $value, /* User preference timezone */ true );
+                               $formatted = $this->getLanguage()->userTimeAndDate( $value, $this->getUser() );
                                break;
 
                        case 'ipb_target':
                                if( $row->ipb_auto ){
-                                       $formatted = wfMessage( 'autoblockid', $row->ipb_id )->parse();
+                                       $formatted = $this->msg( 'autoblockid', $row->ipb_id )->parse();
                                } else {
                                        list( $target, $type ) = Block::parseTarget( $row->ipb_address );
                                        switch( $type ){
@@ -315,7 +313,8 @@ class BlockListPager extends TablePager {
                                        $formatted .= ' ' . Html::rawElement(
                                                'span',
                                                array( 'class' => 'mw-blocklist-actions' ),
-                                               wfMsg( 'parentheses', $this->getLanguage()->pipeList( $links ) )
+                                               $this->msg( 'parentheses' )->rawParams(
+                                                       $this->getLanguage()->pipeList( $links ) )->escaped()
                                        );
                                }
                                break;
@@ -373,7 +372,7 @@ class BlockListPager extends TablePager {
                                'ipb_user',
                                'ipb_by',
                                'ipb_by_text',
-                               'user_name AS by_user_name',
+                               'by_user_name' => 'user_name',
                                'ipb_reason',
                                'ipb_timestamp',
                                'ipb_auto',
@@ -468,7 +467,11 @@ class HTMLBlockedUsersItemSelect extends HTMLSelectField {
                        return true;
                }
 
-               if ( !in_array( $value, $this->mParams['options'] ) ) {
+               // Let folks pick an explicit limit not from our list, as long as it's a real numbr.
+               if ( !in_array( $value, $this->mParams['options'] ) && $value == intval( $value ) && $value > 0 ) {
+                       // This adds the explicitly requested limit value to the drop-down,
+                       // then makes sure it's sorted correctly so when we output the list
+                       // later, the custom option doesn't just show up last.
                        $this->mParams['options'][ $this->mParent->getLanguage()->formatNum( $value ) ] = intval($value);
                        asort( $this->mParams['options'] );
                }