diff options
Diffstat (limited to 'lib/util.php')
| -rw-r--r-- | lib/util.php | 10 |
1 files changed, 5 insertions, 5 deletions
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 +} |