From: Brad Jorsch <bjorsch@wikimedia.org>
Date: Fri, 2 May 2014 14:09:40 +0000 (-0400)
Subject: Fix API login after I7c957e1e
X-Git-Tag: 1.31.0-rc.0~15917^2
X-Git-Url: http://git.cyclocoop.org/%22.%24h.%22?a=commitdiff_plain;h=2036b0d551611e5ff034818a64b4d1991ee6fbe0;p=lhc%2Fweb%2Fwiklou.git

Fix API login after I7c957e1e

Prior to change I7c957e1e, API logins were done as if the "keep me
logged in" checkbox was checked. That change altered this for no
apparent reason.

Bug: 64727
Change-Id: I7fcca2a1eabcac3b2c232cd05d9989af85cc3ed0
---

diff --git a/includes/api/ApiLogin.php b/includes/api/ApiLogin.php
index f2a9d1a1ab..46e2a53d72 100644
--- a/includes/api/ApiLogin.php
+++ b/includes/api/ApiLogin.php
@@ -86,7 +86,7 @@ class ApiLogin extends ApiBase {
 			case LoginForm::SUCCESS:
 				$user = $context->getUser();
 				$this->getContext()->setUser( $user );
-				$user->setCookies( $this->getRequest() );
+				$user->setCookies( $this->getRequest(), null, true );
 
 				ApiQueryInfo::resetTokenCache();