Aaron Schulz has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/225012

Change subject: Fixed local user cache purge in adminDelete()
......................................................................

Fixed local user cache purge in adminDelete()

Change-Id: Ie1ffd645400396658227f2bb98a544119e0aa252
---
M includes/CentralAuthUser.php
1 file changed, 7 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth 
refs/changes/12/225012/1

diff --git a/includes/CentralAuthUser.php b/includes/CentralAuthUser.php
old mode 100644
new mode 100755
index 5dd3c64..d12f84e
--- a/includes/CentralAuthUser.php
+++ b/includes/CentralAuthUser.php
@@ -1225,9 +1225,9 @@
         * @return Status
         */
        function adminDelete( $reason ) {
-               global $wgMemc;
                wfDebugLog( 'CentralAuth', "Deleting global account for user 
{$this->mName}" );
                $centralDB = self::getCentralDB();
+               $wanCache = ObjectCache::getMainWANInstance();
 
                # Synchronise passwords
                $password = $this->getPassword();
@@ -1245,8 +1245,12 @@
                                array( 'user_name' => $name ),
                                __METHOD__
                        );
-                       $id = $localDB->selectField( 'user', 'user_id', array( 
'user_name' => $this->mName ), __METHOD__ );
-                       $wgMemc->delete( "$wiki:user:id:$id" );
+
+                       // @TODO: this has poor separation of concerns :/
+                       $id = $localDB->selectField( 'user', 'user_id',
+                               array( 'user_name' => $this->mName ), 
__METHOD__ );
+                       $wanCache->delete( "$wiki:user:id:$id" );
+
                        $lb->reuseConnection( $localDB );
                }
                $wasSuppressed = $this->isOversighted();

-- 
To view, visit https://gerrit.wikimedia.org/r/225012
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie1ffd645400396658227f2bb98a544119e0aa252
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <asch...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to