Use less fuzzy User::getDBTouched() in ApiStashEdit::getStashKey()

* The getTouched() value can bump more often or vary in DCs

Change-Id: Idffa22c9dde7c7950943b104ed61f5779636b7e7

diff --git a/includes/User.php b/includes/User.php
index fc07b6d..828c9b1 100644 (file)
--- a/includes/User.php
+++ b/includes/User.php
@@ -2383,7 +2383,7 @@ class User implements IDBAccessObject {
         * @return string TS_MW Timestamp
         * @since 1.26
         */
-       protected function getDBTouched() {
+       public function getDBTouched() {
                $this->load();
 
                return $this->mTouched;

diff --git a/includes/api/ApiStashEdit.php b/includes/api/ApiStashEdit.php
index 1b27f60..1f469b8 100644 (file)
--- a/includes/api/ApiStashEdit.php
+++ b/includes/api/ApiStashEdit.php
@@ -331,7 +331,7 @@ class ApiStashEdit extends ApiBase {
                        $content->getDefaultFormat(),
                        sha1( $content->serialize( $content->getDefaultFormat() ) ),
                        $user->getId() ?: md5( $user->getName() ), // account for user parser options
-                       $user->getId() ? $user->getTouched() : '-' // handle preference change races
+                       $user->getId() ? $user->getDBTouched() : '-' // handle preference change races
                ) ) );
 
                return wfMemcKey( 'prepared-edit', md5( $title->getPrefixedDBkey() ), $hash );