| Index: branches/wmf/1.18wmf1/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', '' ) ); |
| Property changes on: branches/wmf/1.18wmf1/includes/specials/SpecialAllmessages.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 129 | 129 | Merged /trunk/phase3/includes/specials/SpecialAllmessages.php:r105853,106780 |
| Index: branches/wmf/1.18wmf1/includes/specials/SpecialBlockList.php |
| — | — | @@ -427,7 +427,11 @@ |
| 428 | 428 | return true; |
| 429 | 429 | } |
| 430 | 430 | |
| 431 | | - if ( !in_array( $value, $this->mParams['options'] ) ) { |
| | 431 | + // Let folks pick an explicit limit not from our list, as long as it's a real numbr. |
| | 432 | + if ( !in_array( $value, $this->mParams['options'] ) && $value == intval( $value ) && $value > 0 ) { |
| | 433 | + // This adds the explicitly requested limit value to the drop-down, |
| | 434 | + // then makes sure it's sorted correctly so when we output the list |
| | 435 | + // later, the custom option doesn't just show up last. |
| 432 | 436 | $this->mParams['options'][ $this->mParent->getLanguage()->formatNum( $value ) ] = intval($value); |
| 433 | 437 | asort( $this->mParams['options'] ); |
| 434 | 438 | } |
| Property changes on: branches/wmf/1.18wmf1/includes/specials/SpecialBlockList.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 435 | 439 | Merged /trunk/phase3/includes/specials/SpecialBlockList.php:r105341,105853,106780 |
| Index: branches/wmf/1.18wmf1/includes/specials/SpecialSearch.php |
| — | — | @@ -99,15 +99,19 @@ |
| 100 | 100 | |
| 101 | 101 | # Extract manually requested namespaces |
| 102 | 102 | $nslist = $this->powerSearch( $request ); |
| 103 | | - $this->profile = $profile = $request->getVal( 'profile', null ); |
| | 103 | + $profile = null; |
| | 104 | + if ( !count( $nslist ) ) { |
| | 105 | + $profile = 'default'; |
| | 106 | + } |
| | 107 | + $profile = $request->getVal( 'profile', $profile ); |
| 104 | 108 | $profiles = $this->getSearchProfiles(); |
| 105 | | - if ( $profile === null) { |
| | 109 | + if ( $profile === null ) { |
| 106 | 110 | // BC with old request format |
| 107 | | - $this->profile = 'advanced'; |
| | 111 | + $profile = 'advanced'; |
| 108 | 112 | if ( count( $nslist ) ) { |
| 109 | 113 | foreach( $profiles as $key => $data ) { |
| 110 | 114 | if ( $nslist === $data['namespaces'] && $key !== 'advanced') { |
| 111 | | - $this->profile = $key; |
| | 115 | + $profile = $key; |
| 112 | 116 | } |
| 113 | 117 | } |
| 114 | 118 | $this->namespaces = $nslist; |
| — | — | @@ -121,7 +125,7 @@ |
| 122 | 126 | $this->namespaces = $profiles[$profile]['namespaces']; |
| 123 | 127 | } else { |
| 124 | 128 | // Unknown profile requested |
| 125 | | - $this->profile = 'default'; |
| | 129 | + $profile = 'default'; |
| 126 | 130 | $this->namespaces = $profiles['default']['namespaces']; |
| 127 | 131 | } |
| 128 | 132 | } |
| — | — | @@ -132,6 +136,7 @@ |
| 133 | 137 | $this->sk = $this->getSkin(); |
| 134 | 138 | $this->didYouMeanHtml = ''; # html of did you mean... link |
| 135 | 139 | $this->fulltext = $request->getVal('fulltext'); |
| | 140 | + $this->profile = $profile; |
| 136 | 141 | } |
| 137 | 142 | |
| 138 | 143 | /** |
| Property changes on: branches/wmf/1.18wmf1/includes/specials |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 139 | 144 | Merged /trunk/phase3/includes/specials:r105341,105853,106780 |
| Property changes on: branches/wmf/1.18wmf1/includes |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 140 | 145 | Merged /trunk/phase3/includes:r105341,105853,106780 |
| Property changes on: branches/wmf/1.18wmf1 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 141 | 146 | Merged /trunk/phase3:r105341,105853,106780 |