From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Wed, 7 Apr 2010 08:50:34 +0000 (+0000)
Subject: Fix for r64677: as reported on mediawiki-api, I forgot about clients that build their... 
X-Git-Tag: 1.31.0-rc.0~37231
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=f16f9df8c35b0e4363c5556142ed42aeb88ae518;p=lhc%2Fweb%2Fwiklou.git

Fix for r64677: as reported on mediawiki-api, I forgot about clients that build their own cookies. Support this do-it-yourself method for the NeedToken error as well.
---

diff --git a/includes/api/ApiLogin.php b/includes/api/ApiLogin.php
index 8fb4604d77..39685ae4ce 100644
--- a/includes/api/ApiLogin.php
+++ b/includes/api/ApiLogin.php
@@ -89,8 +89,11 @@ class ApiLogin extends ApiBase {
 				break;
 			
 			case LoginForm::NEED_TOKEN:
+				global $wgCookiePrefix;
 				$result['result'] = 'NeedToken';
 				$result['token'] = $loginForm->getLoginToken();
+				$result['cookieprefix'] = $wgCookiePrefix;
+				$result['sessionid'] = session_id();
 				break;
 			
 			case LoginForm::WRONG_TOKEN: