revert r106095, fix apparently not this simple

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

diff --git a/includes/specials/SpecialBlockList.php b/includes/specials/SpecialBlockList.php
index f0617b7..ea6fe22 100644 (file)
--- a/includes/specials/SpecialBlockList.php
+++ b/includes/specials/SpecialBlockList.php
@@ -43,6 +43,7 @@ class SpecialBlockList extends SpecialPage {
                $this->setHeaders();
                $this->outputHeader();
                $out = $this->getOutput();
+               $lang = $this->getLanguage();
                $out->setPageTitle( $this->msg( 'ipblocklist' ) );
                $out->addModuleStyles( 'mediawiki.special' );
 
@@ -68,6 +69,7 @@ class SpecialBlockList extends SpecialPage {
                                'label-message' => 'ipadressorusername',
                                'tabindex' => '1',
                                'size' => '45',
+                               'default' => $this->target,
                        ),
                        'Options' => array(
                                'type' => 'multiselect',
@@ -79,6 +81,19 @@ class SpecialBlockList extends SpecialPage {
                                ),
                                'flatlist' => true,
                        ),
+                       'Limit' => array(
+                               'class' => 'HTMLBlockedUsersItemSelect',
+                               'label-message' => 'table_pager_limit_label',
+                               'options' => array(
+                                       $lang->formatNum( 20 ) => 20,
+                                       $lang->formatNum( 50 ) => 50,
+                                       $lang->formatNum( 100 ) => 100,
+                                       $lang->formatNum( 250 ) => 250,
+                                       $lang->formatNum( 500 ) => 500,
+                               ),
+                               'name' => 'limit',
+                               'default' => 50,
+                       ),
                );
                $form = new HTMLForm( $fields, $this->getContext() );
                $form->setMethod( 'get' );
@@ -433,3 +448,36 @@ class BlockListPager extends TablePager {
                wfProfileOut( __METHOD__ );
        }
 }
+
+/**
+ * Items per page dropdown. Essentially a crap workaround for bug 32603.
+ *
+ * @todo Do not release 1.19 with this.
+ */
+class HTMLBlockedUsersItemSelect extends HTMLSelectField {
+       /**
+        * Basically don't do any validation. If it's a number that's fine. Also,
+        * add it to the list if it's not there already
+        *
+        * @param $value
+        * @param $alldata
+        * @return bool
+        */
+       function validate( $value, $alldata ) {
+               if ( $value == '' ) {
+                       return true;
+               }
+
+               // 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'] );
+               }
+
+               return true;
+       }
+
+}