diff options
| author | Brion Vibber <brion@pobox.com> | 2010-02-12 15:32:12 -0800 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-02-12 15:32:12 -0800 |
| commit | f8a459a88adbdfc07b3fbf40c73dacc5b39ddbd9 (patch) | |
| tree | 17aca874063515cffca802a0d411cc4ba98d2aae /lib/util.php | |
| parent | 122c8677b7004bae4cfe7e2bd49fc1bc3187c72c (diff) | |
| parent | d6f1df8b76259acfc0d0566e8bf3610172b27884 (diff) | |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
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 e255c5fe0..8c46f5e35 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) { |