diff options
| author | Zach Copley <zach@status.net> | 2010-02-15 21:14:32 +0000 |
|---|---|---|
| committer | Zach Copley <zach@status.net> | 2010-02-15 21:14:32 +0000 |
| commit | 5db40c440dcfa3f9d19f047c003bbcfaeb69dbc9 (patch) | |
| tree | a6b86448b61ddeecfc0abdc5a13f1eca5723a3e1 /lib/util.php | |
| parent | 5cc1f8b001057e9c4301b173391a7f0a5415f153 (diff) | |
| parent | f5c69dfbf946438fbe1f472de3adb4514db8d090 (diff) | |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'lib/util.php')
| -rw-r--r-- | lib/util.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/util.php b/lib/util.php index a07fe49e3..209dc2254 100644 --- a/lib/util.php +++ b/lib/util.php @@ -367,7 +367,8 @@ function common_current_user() if ($_cur === false) { - if (isset($_REQUEST[session_name()]) || (isset($_SESSION['userid']) && $_SESSION['userid'])) { + if (isset($_COOKIE[session_name()]) || isset($_GET[session_name()]) + || (isset($_SESSION['userid']) && $_SESSION['userid'])) { common_ensure_session(); $id = isset($_SESSION['userid']) ? $_SESSION['userid'] : false; if ($id) { |