summaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-03-09 11:27:30 -0800
committerBrion Vibber <brion@pobox.com>2010-03-09 11:27:30 -0800
commit4caf0d2e73f97c3ee99b2aa902f996e9d3bbab9f (patch)
tree67a3e8112430c003acab323f476db532e04fa943 /actions
parent72e4c733735ac590599bef392611314370135b37 (diff)
parent58192ad68758437a37d8af19d6676d35699ed070 (diff)
Merge commit 'origin/master' into testing
Diffstat (limited to 'actions')
-rw-r--r--actions/otp.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/actions/otp.php b/actions/otp.php
index acf84aee8..1e06603d4 100644
--- a/actions/otp.php
+++ b/actions/otp.php
@@ -126,6 +126,8 @@ class OtpAction extends Action
$this->lt->delete();
$this->lt = null;
+ common_real_login(true);
+
if ($this->rememberme) {
common_rememberme($this->user);
}