Committer: ailyin
LJSUP-6712 (If a leave a comment using any account I should be logged in after publishing)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-06 03:18:11 UTC (rev 17284) +++ trunk/cgi-bin/LJ/Talk/Author/User.pm 2010-09-06 06:39:02 UTC (rev 17285) @@ -158,9 +158,9 @@ } } - # if the user chooses to log in, do so - if ($form->{'do_login'} && ! @$errret) { - $init->{'didlogin'} = $up->make_login_session($exptype, $ipfixed); + # unless the user came from the email form, log them in + if ( !$init->{'used_ecp'} && ! @$errret ) { + $up->make_login_session($exptype, $ipfixed); } else { # record their login session anyway LJ::Session->record_login($up);