Remove getOptions() checks from getStashKey() entirely
authorAaron Schulz <aschulz@wikimedia.org>
Tue, 7 Jun 2016 00:27:37 +0000 (17:27 -0700)
committerAaron Schulz <aschulz@wikimedia.org>
Tue, 7 Jun 2016 00:27:37 +0000 (17:27 -0700)
It only avoided a tiny edge case of options lag, which is
not worth the complexity.

Change-Id: I94bc35fc89eb46436a23b10aee1b7d339859c7ea

includes/api/ApiStashEdit.php

index 01153a5..6b3c26e 100644 (file)
@@ -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 );