Fixup rememberme cookie handling in the POST only case

darcs-hash:20080714050037-08d49-b00c6370c4eed918eee94f828e2d6098b922ba69.gz

diff --git a/lib/util.php b/lib/util.php
index 33a2cac28a354f2f557c3f3c2e920d73c8eafb7b..1b672561fce85c30a81f030d045f9f2ed48eb7c9 100644 (file)
--- a/lib/util.php
+++ b/lib/util.php
@@ -548,7 +548,7 @@ function common_forgetme() {
 
 # who is the current user?
 function common_current_user() {
-       if ($_REQUEST[session_name()]) {
+       if ($_REQUEST[session_name()] || $_SESSION && $_SESSION['userid']) {
                common_ensure_session();
                $id = $_SESSION['userid'];
                if ($id) {
@@ -559,6 +559,11 @@ function common_current_user() {
        }
        # that didn't work; try to remember
        $user = common_remembered_user();
+       common_debug("Got User " . $user->nickname);
+       if ($user) {
+           common_debug("Faking session on remembered user");
+           $_SESSION['userid'] = $user->id;
+       }
        return $user;
 }