From 6f74a091e1b2972d991db1797ed060e0a22c6470 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@prodromou.name>
Date: Fri, 20 Jun 2008 02:54:55 -0400
Subject: don't keep cached user

darcs-hash:20080620065455-84dde-0c3bd495205e49ba2c5a8e040495339f35f9b215.gz
---
 lib/util.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'lib/util.php')

diff --git a/lib/util.php b/lib/util.php
index 646d93c3b..a88327081 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -415,14 +415,14 @@ function common_set_user($nickname) {
 
 # who is the current user?
 function common_current_user() {
-	static $user = NULL; # FIXME: global memcached
-	if (is_null($user)) {
-		common_ensure_session();
-		$id = $_SESSION['userid'];
+	$user = NULL;
+	if (common_have_session()) {
+		$id = $_SESSION['userid'];	
 		if ($id) {
 			$user = User::staticGet($id);
 		}
 	}
+	
 	return $user;
 }
 
@@ -899,4 +899,4 @@ function common_copy_args($from) {
 		$to[$k] = ($strip) ? stripslashes($v) : $v;
 	}
 	return $to;
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3-54-g00ecf