ensure rather than check for session

darcs-hash:20080517193520-84dde-e0e0ad44fa0b87e7964fa36375b656e7cfabf865.gz

1 files changed, 4 insertions, 5 deletions

diff --git a/lib/common.php b/lib/common.php
index b6e01a096..425fbccb4 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -227,11 +227,10 @@ function common_set_user($nickname) {
 function common_current_user() {
 	static $user = NULL; # FIXME: global memcached
 	if (is_null($user)) {
-		if (common_have_session()) {
-			$id = $_SESSION['userid'];
-			if ($id) {
-				$user = User::staticGet($id);
-			}
+		common_ensure_session();
+		$id = $_SESSION['userid'];
+		if ($id) {
+			$user = User::staticGet($id);
 		}
 	}
 	return $user;