| Index: branches/REL1_18/phase3/includes/specials/SpecialAllmessages.php |
| — | — | @@ -62,9 +62,6 @@ |
| 63 | 63 | |
| 64 | 64 | $out->addModuleStyles( 'mediawiki.special' ); |
| 65 | 65 | |
| 66 | | - $this->filter = $request->getVal( 'filter', 'all' ); |
| 67 | | - $this->prefix = $request->getVal( 'prefix', '' ); |
| 68 | | - |
| 69 | 66 | $this->table = new AllmessagesTablePager( |
| 70 | 67 | $this, |
| 71 | 68 | array(), |
| — | — | @@ -118,10 +115,13 @@ |
| 119 | 116 | $this->langcode = $this->lang->getCode(); |
| 120 | 117 | $this->foreign = $this->langcode != $wgContLang->getCode(); |
| 121 | 118 | |
| 122 | | - if( $wgRequest->getVal( 'filter', 'all' ) === 'all' ){ |
| | 119 | + $request = $this->getRequest(); |
| | 120 | + |
| | 121 | + $this->filter = $request->getVal( 'filter', 'all' ); |
| | 122 | + if( $this->filter === 'all' ){ |
| 123 | 123 | $this->custom = null; // So won't match in either case |
| 124 | 124 | } else { |
| 125 | | - $this->custom = ($wgRequest->getVal( 'filter' ) == 'unmodified'); |
| | 125 | + $this->custom = ($this->filter == 'unmodified'); |
| 126 | 126 | } |
| 127 | 127 | |
| 128 | 128 | $prefix = $wgLang->ucfirst( $wgRequest->getVal( 'prefix', '' ) ); |
| Index: branches/REL1_18/phase3/includes/specials/SpecialBlockList.php |
| — | — | @@ -426,7 +426,11 @@ |
| 427 | 427 | return true; |
| 428 | 428 | } |
| 429 | 429 | |
| 430 | | - if ( !in_array( $value, $this->mParams['options'] ) ) { |
| | 430 | + // Let folks pick an explicit limit not from our list, as long as it's a real numbr. |
| | 431 | + if ( !in_array( $value, $this->mParams['options'] ) && $value == intval( $value ) && $value > 0 ) { |
| | 432 | + // This adds the explicitly requested limit value to the drop-down, |
| | 433 | + // then makes sure it's sorted correctly so when we output the list |
| | 434 | + // later, the custom option doesn't just show up last. |
| 431 | 435 | $this->mParams['options'][ $this->mParent->getLanguage()->formatNum( $value ) ] = intval($value); |
| 432 | 436 | asort( $this->mParams['options'] ); |
| 433 | 437 | } |
| Property changes on: branches/REL1_18/phase3/includes/specials |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 434 | 438 | Merged /trunk/phase3/includes/specials:r105341,105853,105897 |
| Property changes on: branches/REL1_18/phase3/includes |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 435 | 439 | Merged /trunk/phase3/includes:r105341,105853,105897 |
| Property changes on: branches/REL1_18/phase3 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 436 | 440 | Merged /trunk/phase3:r105341,105853,105897 |