From: Aaron Schulz <aschulz@wikimedia.org>
Date: Tue, 7 Jun 2016 00:27:37 +0000 (-0700)
Subject: Remove getOptions() checks from getStashKey() entirely
X-Git-Tag: 1.31.0-rc.0~6701
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/journal.php?a=commitdiff_plain;h=27e6e298885542536bcef6dd23161bcb733d5b0a;p=lhc%2Fweb%2Fwiklou.git

Remove getOptions() checks from getStashKey() entirely

It only avoided a tiny edge case of options lag, which is
not worth the complexity.

Change-Id: I94bc35fc89eb46436a23b10aee1b7d339859c7ea
---

diff --git a/includes/api/ApiStashEdit.php b/includes/api/ApiStashEdit.php
index 01153a58c9..6b3c26e9c9 100644
--- a/includes/api/ApiStashEdit.php
+++ b/includes/api/ApiStashEdit.php
@@ -412,9 +412,7 @@ class ApiStashEdit extends ApiBase {
 			sha1( $content->serialize( $content->getDefaultFormat() ) ),
 			// Account for user name related variables like signatures
 			$user->getId(),
-			md5( $user->getName() ),
-			(string)$user->getOption( 'nickname' ),
-			(int)$user->getBoolOption( 'fancysig' )
+			md5( $user->getName() )
 		] ) );
 
 		return wfMemcKey( 'prepared-edit', md5( $title->getPrefixedDBkey() ), $hash );