| Index: trunk/phase3/includes/SpecialPageFactory.php |
| — | — | @@ -417,10 +417,10 @@ |
| 418 | 418 | $page = self::getPage( $name ); |
| 419 | 419 | // Nonexistent? |
| 420 | 420 | if ( !$page ) { |
| 421 | | - $context->output->setArticleRelated( false ); |
| 422 | | - $context->output->setRobotPolicy( 'noindex,nofollow' ); |
| 423 | | - $context->output->setStatusCode( 404 ); |
| 424 | | - $context->output->showErrorPage( 'nosuchspecialpage', 'nospecialpagetext' ); |
| | 421 | + $context->getOutput()->setArticleRelated( false ); |
| | 422 | + $context->getOutput()->setRobotPolicy( 'noindex,nofollow' ); |
| | 423 | + $context->getOutput()->setStatusCode( 404 ); |
| | 424 | + $context->getOutput()->showErrorPage( 'nosuchspecialpage', 'nospecialpagetext' ); |
| 425 | 425 | wfProfileOut( __METHOD__ ); |
| 426 | 426 | return false; |
| 427 | 427 | } |
| — | — | @@ -434,17 +434,17 @@ |
| 435 | 435 | // the request. Such POST requests are possible for old extensions that |
| 436 | 436 | // generate self-links without being aware that their default name has |
| 437 | 437 | // changed. |
| 438 | | - if ( $name != $page->getLocalName() && !$context->request->wasPosted() ) { |
| 439 | | - $query = $context->request->getQueryValues(); |
| | 438 | + if ( $name != $page->getLocalName() && !$context->getRequest()->wasPosted() ) { |
| | 439 | + $query = $context->getRequest()->getQueryValues(); |
| 440 | 440 | unset( $query['title'] ); |
| 441 | 441 | $query = wfArrayToCGI( $query ); |
| 442 | 442 | $title = $page->getTitle( $par ); |
| 443 | 443 | $url = $title->getFullUrl( $query ); |
| 444 | | - $context->output->redirect( $url ); |
| | 444 | + $context->getOutput()->redirect( $url ); |
| 445 | 445 | wfProfileOut( __METHOD__ ); |
| 446 | 446 | return $title; |
| 447 | 447 | } else { |
| 448 | | - $context->title = $page->getTitle(); |
| | 448 | + $context->setTitle( $page->getTitle() ); |
| 449 | 449 | } |
| 450 | 450 | |
| 451 | 451 | } elseif ( !$page->isIncludable() ) { |
| Index: trunk/phase3/includes/SpecialPage.php |
| — | — | @@ -856,14 +856,14 @@ |
| 857 | 857 | // Redirect to a page title with possible query parameters |
| 858 | 858 | if ( $redirect instanceof Title ) { |
| 859 | 859 | $url = $redirect->getFullUrl( $query ); |
| 860 | | - $this->getContext()->output->redirect( $url ); |
| | 860 | + $this->getOutput()->redirect( $url ); |
| 861 | 861 | wfProfileOut( __METHOD__ ); |
| 862 | 862 | return $redirect; |
| 863 | 863 | // Redirect to index.php with query parameters |
| 864 | 864 | } elseif ( $redirect === true ) { |
| 865 | 865 | global $wgScript; |
| 866 | 866 | $url = $wgScript . '?' . wfArrayToCGI( $query ); |
| 867 | | - $this->getContext()->output->redirect( $url ); |
| | 867 | + $this->getOutput()->redirect( $url ); |
| 868 | 868 | wfProfileOut( __METHOD__ ); |
| 869 | 869 | return $redirect; |
| 870 | 870 | } else { |