From 79ccf9e0c7e2ae11464dfe427689d58ded08b3ce Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Thu, 29 Apr 2010 20:55:39 +0000
Subject: [PATCH] Don't consult global current_user object for usermeta values.
 Use get_userdata().

git-svn-id: http://svn.automattic.com/wordpress/trunk@14311 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/user.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/wp-includes/user.php b/wp-includes/user.php
index 8d34d1200..de6d96288 100644
--- a/wp-includes/user.php
+++ b/wp-includes/user.php
@@ -238,10 +238,11 @@ function get_user_option( $option, $user = 0, $deprecated = '' ) {
 
 	if ( empty($user) ) {
 		$user = wp_get_current_user();
-	} else {
-		$user = get_userdata($user);
+		$user = $user->ID;
 	}
 
+	$user = get_userdata($user);
+
 	// Keys used as object vars cannot have dashes.
 	$key = str_replace('-', '_', $option);