| Index: trunk/phase3/includes/specials/SpecialResetpass.php |
| — | — | @@ -203,9 +203,11 @@ |
| 204 | 204 | if ( !$this->mSelfChange ) { |
| 205 | 205 | $log = new LogPage( 'password' ); |
| 206 | 206 | $log->addEntry( 'reset', $user->getUserPage(), $this->mComment ); |
| | 207 | + } else { |
| | 208 | + // Only set cookies if it was a self-change |
| | 209 | + $user->setCookies(); |
| 207 | 210 | } |
| 208 | 211 | |
| 209 | | - $user->setCookies(); |
| 210 | 212 | $user->saveSettings(); |
| 211 | 213 | } |
| 212 | 214 | } |