From e7a9f8db0b317ea24eb04f503549c1e235b10a97 Mon Sep 17 00:00:00 2001
From: Chad Horohoe <demon@users.mediawiki.org>
Date: Sat, 21 Feb 2009 22:44:19 +0000
Subject: [PATCH] Only set cookies if it's us :p

---
 includes/specials/SpecialResetpass.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/includes/specials/SpecialResetpass.php b/includes/specials/SpecialResetpass.php
index 1678fc3055..2884e00ff6 100644
--- a/includes/specials/SpecialResetpass.php
+++ b/includes/specials/SpecialResetpass.php
@@ -203,9 +203,11 @@ class SpecialResetpass extends SpecialPage {
 		if ( !$this->mSelfChange ) {
 			$log = new LogPage( 'password' );
 			$log->addEntry( 'reset', $user->getUserPage(), $this->mComment );
+		} else {
+			// Only set cookies if it was a self-change
+			$user->setCookies();
 		}
 		
-		$user->setCookies();
 		$user->saveSettings();
 	}
 }
-- 
2.20.1