From: Sam Reed <reedy@users.mediawiki.org>
Date: Mon, 6 Jun 2011 19:26:58 +0000 (+0000)
Subject: Revert r89537 till we decide a sane way to have it on/off as API bools suck
X-Git-Tag: 1.31.0-rc.0~29659
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22auteur_infos%22%2C%22id_auteur=%24connect_id_auteur%22%29%20.%20%22?a=commitdiff_plain;h=eee96194a89ea4948c89c7e983dcc04aafbda789;p=lhc%2Fweb%2Fwiklou.git

Revert r89537 till we decide a sane way to have it on/off as API bools suck
---

diff --git a/RELEASE-NOTES-1.19 b/RELEASE-NOTES-1.19
index 9ec4dbb9a5..3eb15203a6 100644
--- a/RELEASE-NOTES-1.19
+++ b/RELEASE-NOTES-1.19
@@ -99,8 +99,6 @@ production.
 * (bug 28897) rvparse doesn’t seem to work with rvsection
 * (bug 25734) API: possible issue with revids validation
 * (bug 28002) Internal error in ApiFormatRaw::getMimeType
-* (bug 26597) Allow toggling of persistent cookies ("remember me") in API
-  action=login
 * (bug 29237) add interwiki target url attribute to api/query/interwiki
 * (bug 28392) mark action=undelete&timestamps as type "timestamp"
 * (bug 21346) Make deleted images searchable by hash (disabled in Miser Mode)
diff --git a/includes/api/ApiLogin.php b/includes/api/ApiLogin.php
index ff0a360284..fa576266c1 100644
--- a/includes/api/ApiLogin.php
+++ b/includes/api/ApiLogin.php
@@ -60,12 +60,9 @@ class ApiLogin extends ApiBase {
 			'wpPassword' => $params['password'],
 			'wpDomain' => $params['domain'],
 			'wpLoginToken' => $params['token'],
+			'wpRemember' => ''
 		) );
 
-		if ( $params['rememberme'] ) {
-			$req['wpRemember'] = '';
-		}
-
 		// Init session if necessary
 		if ( session_id() == '' ) {
 			wfSetupSession();
@@ -171,10 +168,6 @@ class ApiLogin extends ApiBase {
 			'password' => null,
 			'domain' => null,
 			'token' => null,
-			'rememberme'  => array(
-				ApiBase::PARAM_TYPE => 'boolean',
-				ApiBase::PARAM_DFLT => true,
-			),
 		);
 	}
 
@@ -184,7 +177,6 @@ class ApiLogin extends ApiBase {
 			'password' => 'Password',
 			'domain' => 'Domain (optional)',
 			'token' => 'Login token obtained in first request',
-			'rememberme' => 'Make the cookies persistant'
 		);
 	}