From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Mon, 5 May 2014 19:52:20 +0000 (+0000)
Subject: Merge "Fix doc for Revision::newFromPageId"
X-Git-Tag: 1.31.0-rc.0~15883
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmembres/modifier.php?a=commitdiff_plain;h=e441caba01548701dab48b17847145800d483845;hp=92c4dffd55ba7e24801c53f8d88f910f84561176;p=lhc%2Fweb%2Fwiklou.git

Merge "Fix doc for Revision::newFromPageId"
---

diff --git a/includes/specials/SpecialChangePassword.php b/includes/specials/SpecialChangePassword.php
index 91d0404d8f..8afbf4b770 100644
--- a/includes/specials/SpecialChangePassword.php
+++ b/includes/specials/SpecialChangePassword.php
@@ -296,7 +296,8 @@ class SpecialChangePassword extends FormSpecialPage {
 		if ( $isSelf ) {
 			// This is needed to keep the user connected since
 			// changing the password also modifies the user's token.
-			$user->setCookies();
+			$remember = $this->getRequest()->getCookie( 'Token' ) !== null;
+			$user->setCookies( null, null, $remember );
 		}
 		$user->resetPasswordExpiration();
 		$user->saveSettings();