From e94c57e423a43b5555900e53cac41064495c4462 Mon Sep 17 00:00:00 2001
From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Thu, 9 Jun 2011 20:00:40 +0000
Subject: [PATCH] Recommit SpecialPage.php and SpecialPageFactory.php parts of
 r89406 (removal of magic __get() accessor for RequestContext)

---
 includes/SpecialPage.php        |  4 ++--
 includes/SpecialPageFactory.php | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/includes/SpecialPage.php b/includes/SpecialPage.php
index d5e698565f..5e26824301 100644
--- a/includes/SpecialPage.php
+++ b/includes/SpecialPage.php
@@ -856,14 +856,14 @@ abstract class RedirectSpecialPage extends UnlistedSpecialPage {
 		// Redirect to a page title with possible query parameters
 		if ( $redirect instanceof Title ) {
 			$url = $redirect->getFullUrl( $query );
-			$this->getContext()->output->redirect( $url );
+			$this->getOutput()->redirect( $url );
 			wfProfileOut( __METHOD__ );
 			return $redirect;
 		// Redirect to index.php with query parameters
 		} elseif ( $redirect === true ) {
 			global $wgScript;
 			$url = $wgScript . '?' . wfArrayToCGI( $query );
-			$this->getContext()->output->redirect( $url );
+			$this->getOutput()->redirect( $url );
 			wfProfileOut( __METHOD__ );
 			return $redirect;
 		} else {
diff --git a/includes/SpecialPageFactory.php b/includes/SpecialPageFactory.php
index ea0048c91a..c119b119e6 100644
--- a/includes/SpecialPageFactory.php
+++ b/includes/SpecialPageFactory.php
@@ -417,10 +417,10 @@ class SpecialPageFactory {
 		$page = self::getPage( $name );
 		// Nonexistent?
 		if ( !$page ) {
-			$context->output->setArticleRelated( false );
-			$context->output->setRobotPolicy( 'noindex,nofollow' );
-			$context->output->setStatusCode( 404 );
-			$context->output->showErrorPage( 'nosuchspecialpage', 'nospecialpagetext' );
+			$context->getOutput()->setArticleRelated( false );
+			$context->getOutput()->setRobotPolicy( 'noindex,nofollow' );
+			$context->getOutput()->setStatusCode( 404 );
+			$context->getOutput()->showErrorPage( 'nosuchspecialpage', 'nospecialpagetext' );
 			wfProfileOut( __METHOD__ );
 			return false;
 		}
@@ -434,17 +434,17 @@ class SpecialPageFactory {
 			// the request. Such POST requests are possible for old extensions that
 			// generate self-links without being aware that their default name has
 			// changed.
-			if ( $name != $page->getLocalName() && !$context->request->wasPosted() ) {
-				$query = $context->request->getQueryValues();
+			if ( $name != $page->getLocalName() && !$context->getRequest()->wasPosted() ) {
+				$query = $context->getRequest()->getQueryValues();
 				unset( $query['title'] );
 				$query = wfArrayToCGI( $query );
 				$title = $page->getTitle( $par );
 				$url = $title->getFullUrl( $query );
-				$context->output->redirect( $url );
+				$context->getOutput()->redirect( $url );
 				wfProfileOut( __METHOD__ );
 				return $title;
 			} else {
-				$context->title = $page->getTitle();
+				$context->setTitle( $page->getTitle() );
 			}
 
 		} elseif ( !$page->isIncludable() ) {
-- 
2.20.1