Session fix for PHP 5.3 configurations where cookies are excluded from $_REQUEST...

diff --git a/lib/util.php b/lib/util.php
index a07fe49e33d4502506fd3fc04450abe334d48321..209dc2254ed321c5da7418df812f7026d1ce0c2d 100644 (file)
--- 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) {