From: Niklas Laxström <nikerabbit@users.mediawiki.org>
Date: Tue, 14 Sep 2010 07:49:24 +0000 (+0000)
Subject: Avoid extra query by reusing $wgUser if possible
X-Git-Tag: 1.31.0-rc.0~34938
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/%7B%7B%20url_for%28%27admin_users%27%29%20%7D%7D?a=commitdiff_plain;h=eae0c97c15f2a861eb5869134e228fde327dd53d;p=lhc%2Fweb%2Fwiklou.git

Avoid extra query by reusing $wgUser if possible
---

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;