From 420eef18f2cc96b6d35d8b779ce2f4fe43ab43a4 Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Fri, 5 Dec 2008 06:08:46 +0000
Subject: [PATCH] Don't check blog options for user-settings

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

diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index 3651cd6ac8..d9b007f5a4 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -674,7 +674,7 @@ function wp_user_settings() {
 	if ( ! $user = wp_get_current_user() )
 		return;
 
-	$settings = get_user_option( 'user-settings', $user->ID );
+	$settings = get_user_option( 'user-settings', $user->ID, false );
 
 	if ( isset($_COOKIE['wp-settings-'.$user->ID]) ) {
 		$cookie = preg_replace( '/[^A-Za-z0-9=&_]/', '', $_COOKIE['wp-settings-'.$user->ID] );
@@ -683,7 +683,7 @@ function wp_user_settings() {
 			if ( $cookie == $settings )
 				return;
 
-			$last_time = (int) get_user_option( 'user-settings-time', $user->ID );
+			$last_time = (int) get_user_option( 'user-settings-time', $user->ID, false );
 			$saved = isset($_COOKIE['wp-settings-time-'.$user->ID]) ? preg_replace( '/[^0-9]/', '', $_COOKIE['wp-settings-time-'.$user->ID] ) : 0;
 
 			if ( $saved > $last_time ) {