From eae0c97c15f2a861eb5869134e228fde327dd53d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Niklas=20Laxstr=C3=B6m?= <nikerabbit@users.mediawiki.org>
Date: Tue, 14 Sep 2010 07:49:24 +0000
Subject: [PATCH] Avoid extra query by reusing $wgUser if possible

---
 includes/ResourceLoaderModule.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/includes/ResourceLoaderModule.php b/includes/ResourceLoaderModule.php
index 3551d2e7de..990a814d8e 100644
--- a/includes/ResourceLoaderModule.php
+++ b/includes/ResourceLoaderModule.php
@@ -828,7 +828,13 @@ class ResourceLoaderUserPreferencesModule extends ResourceLoaderModule {
 		if ( isset( $this->modifiedTime[$hash] ) ) {
 			return $this->modifiedTime[$hash];
 		}
-		if ( $context->getUser() && $user = User::newFromName( $context->getUser() ) ) {
+
+		global $wgUser;
+		$username = $context->getUser();
+		// Avoid extra db query by using $wgUser if possible
+		$user = $wgUser->getName() === $username ? $wgUser : User::newFromName( $username );
+
+		if ( $user ) {
 			return $this->modifiedTime[$hash] = $user->getTouched();
 		} else {
 			return 0;
-- 
2.20.1