From 623d11f435abbfe56e059981477df2fe2f9df9f4 Mon Sep 17 00:00:00 2001
From: Trevor Parscal <tparscal@users.mediawiki.org>
Date: Sat, 11 Sep 2010 09:09:49 +0000
Subject: [PATCH] Fixed fatal error - now $user is being checked to be
 sucessfully built before it's used.

---
 includes/ResourceLoaderModule.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/includes/ResourceLoaderModule.php b/includes/ResourceLoaderModule.php
index cbe827eddc..8ea392b963 100644
--- a/includes/ResourceLoaderModule.php
+++ b/includes/ResourceLoaderModule.php
@@ -839,8 +839,7 @@ class ResourceLoaderUserPreferencesModule extends ResourceLoaderModule {
 		if ( isset( $this->modifiedTime[$hash] ) ) {
 			return $this->modifiedTime[$hash];
 		}
-		if ( $context->getUser() ) {
-			$user = User::newFromName( $context->getUser() );
+		if ( $context->getUser() && $user = User::newFromName( $context->getUser() ) ) {
 			return $this->modifiedTime[$hash] = $user->getTouched();
 		} else {
 			return 0;
-- 
2.20.1