[livejournal] r17282: Revert of 17262

U   trunk/cgi-bin/LJ/Talk/Author/User.pm

Modified: trunk/cgi-bin/LJ/Talk/Author/User.pm
===================================================================
--- trunk/cgi-bin/LJ/Talk/Author/User.pm	2010-09-03 18:40:27 UTC (rev 17281)
+++ trunk/cgi-bin/LJ/Talk/Author/User.pm	2010-09-03 18:43:05 UTC (rev 17282)
@@ -158,7 +158,13 @@
         }
     }
 
-    $init->{'didlogin'} = $up->make_login_session($exptype, $ipfixed);
+    # if the user chooses to log in, do so
+    if ($form->{'do_login'} && ! @$errret) {
+        $init->{'didlogin'} = $up->make_login_session($exptype, $ipfixed);
+    } else {
+        # record their login session anyway
+        LJ::Session->record_login($up);
+    }
 
     return $up;
 }