| Index: trunk/phase3/includes/specials/SpecialSearch.php |
| — | — | @@ -81,7 +81,6 @@ |
| 82 | 82 | */ |
| 83 | 83 | public function load( &$request, &$user ) { |
| 84 | 84 | list( $this->limit, $this->offset ) = $request->getLimitOffset( 20, 'searchlimit' ); |
| 85 | | - $this->mPrefix = $request->getVal('prefix', ''); |
| 86 | 85 | |
| 87 | 86 | |
| 88 | 87 | # Extract manually requested namespaces |
| — | — | @@ -177,7 +176,6 @@ |
| 178 | 177 | $search->setNamespaces( $this->namespaces ); |
| 179 | 178 | $search->showRedirects = $this->searchRedirects; // BC |
| 180 | 179 | $search->setFeatureData( 'list-redirects', $this->searchRedirects ); |
| 181 | | - $search->prefix = $this->mPrefix; |
| 182 | 180 | $term = $search->transformSearchTerm($term); |
| 183 | 181 | |
| 184 | 182 | wfRunHooks( 'SpecialSearchSetupEngine', array( $this, $this->profile, $search ) ); |
| — | — | @@ -430,12 +428,13 @@ |
| 431 | 429 | */ |
| 432 | 430 | protected function powerSearchOptions() { |
| 433 | 431 | $opt = array(); |
| 434 | | - foreach( $this->namespaces as $n ) { |
| 435 | | - $opt['ns' . $n] = 1; |
| 436 | | - } |
| 437 | 432 | $opt['redirs'] = $this->searchRedirects ? 1 : 0; |
| 438 | | - if( $this->profile ) { |
| | 433 | + if( $this->profile !== 'advanced' ) { |
| 439 | 434 | $opt['profile'] = $this->profile; |
| | 435 | + } else { |
| | 436 | + foreach( $this->namespaces as $n ) { |
| | 437 | + $opt['ns' . $n] = 1; |
| | 438 | + } |
| 440 | 439 | } |
| 441 | 440 | return $opt; |
| 442 | 441 | } |