summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlezvous.ca>2008-06-23 23:28:18 -0400
committerEvan Prodromou <evan@controlezvous.ca>2008-06-23 23:28:18 -0400
commitfcd473a1a36fcc9a2940d6ce217fed4c744b4dae (patch)
tree5874007d7834308576c636d16221a89cf93c2afc
parent25b9085efe2bc319d1cad6c2da4d19e15242c9cd (diff)
set user takes a nickname, not a user object
darcs-hash:20080624032818-34904-bf8c5594c42c797820e080250c955645a5a84aa1.gz
-rw-r--r--lib/util.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/util.php b/lib/util.php
index 5f184cce8..791a40690 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -451,7 +451,6 @@ define('REMEMBERME', 'rememberme');
define('REMEMBERME_EXPIRY', 30 * 24 * 60 * 60);
function common_rememberme() {
- common_debug('rememberme called', __FILE__);
$user = common_current_user();
if (!$user) {
return false;
@@ -486,7 +485,7 @@ function common_remembered_user() {
common_log_db_error($rm, 'DELETE', __FILE__);
$user = NULL;
} else {
- common_set_user($user);
+ common_set_user($user->nickname);
common_real_login(false);
# We issue a new cookie, so they can log in
# automatically again after this session