| Index: trunk/phase3/includes/SpecialPageFactory.php |
| — | — | @@ -414,25 +414,7 @@ |
| 415 | 415 | // Page exists, set the context |
| 416 | 416 | $page->setContext( $context ); |
| 417 | 417 | |
| 418 | | - // Check for redirect |
| 419 | 418 | if ( !$including ) { |
| 420 | | - if( $page instanceof SpecialRedirectToSpecial ){ |
| 421 | | - $redirect = $page->getRedirect( $par ); |
| 422 | | - $query = $page->getRedirectQuery(); |
| 423 | | - if ( $redirect instanceof Title ) { |
| 424 | | - $url = $redirect->getFullUrl( $query ); |
| 425 | | - $context->output->redirect( $url ); |
| 426 | | - wfProfileOut( __METHOD__ ); |
| 427 | | - return $redirect; |
| 428 | | - } elseif ( $redirect === true ) { |
| 429 | | - global $wgScript; |
| 430 | | - $url = $wgScript . '?' . wfArrayToCGI( $query ); |
| 431 | | - $context->output->redirect( $url ); |
| 432 | | - wfProfileOut( __METHOD__ ); |
| 433 | | - return $redirect; |
| 434 | | - } |
| 435 | | - } |
| 436 | | - |
| 437 | 419 | // Redirect to canonical alias for GET commands |
| 438 | 420 | // Not for POST, we'd lose the post data, so it's best to just distribute |
| 439 | 421 | // the request. Such POST requests are possible for old extensions that |
| Index: trunk/phase3/includes/db/Database.php |
| — | — | @@ -1039,7 +1039,8 @@ |
| 1040 | 1040 | * see DatabaseBase::makeSelectOptions code for list of supported stuff |
| 1041 | 1041 | * @param $join_conds Array: Associative array of table join conditions (optional) |
| 1042 | 1042 | * (e.g. array( 'page' => array('LEFT JOIN','page_latest=rev_id') ) |
| 1043 | | - * @return mixed Database result resource (feed to DatabaseBase::fetchObject or whatever), or false on failure |
| | 1043 | + * @return ResultWrapper|Bool Database result resource (feed to DatabaseBase::fetchObject |
| | 1044 | + * or whatever), or false on failure |
| 1044 | 1045 | */ |
| 1045 | 1046 | function select( $table, $vars, $conds = '', $fname = 'DatabaseBase::select', $options = array(), $join_conds = array() ) { |
| 1046 | 1047 | $sql = $this->selectSQLText( $table, $vars, $conds, $fname, $options, $join_conds ); |