Start unpicking r85288 (magic __get() accessor for RequestContext). Instead, bring back some of r86872 (abstract base class for classes providing access to RequestContext methods), which is a more 'classical' solution.

1 files changed, 2 insertions, 2 deletions

diff --git a/index.php b/index.php
index c7d0f92d117b..10bea5f1ecd6 100644
--- a/index.php
+++ b/index.php
@@ -130,14 +130,14 @@ function wfIndexMain() {
 			$cache = new HTMLFileCache( $wgTitle, $action );
 			if ( $cache->isFileCacheGood( /* Assume up to date */ ) ) {
 				/* Check incoming headers to see if client has this cached */
-				if ( !$context->output->checkLastModified( $cache->fileCacheTime() ) ) {
+				if ( !$context->getOutput()->checkLastModified( $cache->fileCacheTime() ) ) {
 					$cache->loadFromFileCache();
 				}
 				# Do any stats increment/watchlist stuff
 				$article = Article::newFromTitle( $wgTitle, $context );
 				$article->viewUpdates();
 				# Tell OutputPage that output is taken care of
-				$context->output->disable();
+				$context->getOutput()->disable();
 				wfProfileOut( 'index.php-filecache' );
 				$mediaWiki->finalCleanup();
 				wfProfileOut( 'index.php' );