From 9717e5cb18c05c20351986c612fbb46529c20e8d Mon Sep 17 00:00:00 2001 From: Alexandre Emsenhuber Date: Mon, 19 Dec 2011 16:05:47 +0000 Subject: [PATCH] * Inlinise the only usage of $user in MediaWiki::main() * Change the name of the variable containing the WikiPage object for more consistency --- includes/Wiki.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/includes/Wiki.php b/includes/Wiki.php index 2a3444eeb3..4984b5f0ca 100644 --- a/includes/Wiki.php +++ b/includes/Wiki.php @@ -583,7 +583,6 @@ class MediaWiki { # Set title from request parameters $wgTitle = $this->getTitle(); $action = $this->getAction(); - $user = $this->context->getUser(); # Send Ajax requests to the Ajax dispatcher. if ( $wgUseAjax && $action == 'ajax' ) { @@ -605,8 +604,8 @@ class MediaWiki { $cache->loadFromFileCache( $this->context ); } # Do any stats increment/watchlist stuff - $article = WikiPage::factory( $this->getTitle() ); - $article->doViewUpdates( $user ); + $page = WikiPage::factory( $this->getTitle() ); + $page->doViewUpdates( $this->context->getUser() ); # Tell OutputPage that output is taken care of $this->context->getOutput()->disable(); wfProfileOut( 'main-try-filecache' ); -- 2.20.1