summaryrefslogtreecommitdiff
path: root/lib/util.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-01-12 23:58:32 -0800
committerEvan Prodromou <evan@status.net>2010-01-12 23:58:32 -0800
commitf05ae1f210021d8aab022ff80f102bcb6834078f (patch)
treecdb53be699ab2afb97606c29d19823c774e2bd4d /lib/util.php
parent436b8c845ea8fcc84f7f2bff71a7fa700d262a01 (diff)
parent155e4ef4f32413452acf1b0bc6486d85bfc71cc0 (diff)
Merge branch '0.9.x' into inblob
Diffstat (limited to 'lib/util.php')
-rw-r--r--lib/util.php7
1 files changed, 0 insertions, 7 deletions
diff --git a/lib/util.php b/lib/util.php
index df6bee4d4..9255b9b37 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -191,7 +191,6 @@ function common_ensure_session()
}
}
}
- common_debug("Session ID = " . session_id());
}
// Three kinds of arguments:
@@ -258,7 +257,6 @@ function common_rememberme($user=null)
if (!$user) {
$user = common_current_user();
if (!$user) {
- common_debug('No current user to remember', __FILE__);
return false;
}
}
@@ -276,14 +274,11 @@ function common_rememberme($user=null)
if (!$result) {
common_log_db_error($rm, 'INSERT', __FILE__);
- common_debug('Error adding rememberme record for ' . $user->nickname, __FILE__);
return false;
}
$rm->query('COMMIT');
- common_debug('Inserted rememberme record (' . $rm->code . ', ' . $rm->user_id . '); result = ' . $result . '.', __FILE__);
-
$cookieval = $rm->user_id . ':' . $rm->code;
common_log(LOG_INFO, 'adding rememberme cookie "' . $cookieval . '" for ' . $user->nickname);
@@ -391,8 +386,6 @@ function common_current_user()
$_cur = common_remembered_user();
if ($_cur) {
- common_debug("Got User " . $_cur->nickname);
- common_debug("Faking session on remembered user");
// XXX: Is this necessary?
$_SESSION['userid'] = $_cur->id;
}