Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/265823
Change subject: Make preventSessionsForUser() use READ_LATEST
......................................................................
Make preventSessionsForUser() use READ_LATEST
Bug: T124441
Change-Id: Id5b9f27c7814937eb5e71a0a6fb219173325c41a
---
M includes/session/SessionManager.php
M includes/user/User.php
2 files changed, 7 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/23/265823/1
diff --git a/includes/session/SessionManager.php
b/includes/session/SessionManager.php
index c4f33d0..588eca4 100644
--- a/includes/session/SessionManager.php
+++ b/includes/session/SessionManager.php
@@ -529,9 +529,12 @@
// Reset the user's token to kill existing sessions
$user = User::newFromName( $username );
- if ( $user && $user->getToken() ) {
- $user->setToken( true );
- $user->saveSettings();
+ if ( $user ) { // valid name
+ $user->load( User::READ_LATEST ); // T124441
+ if ( $user->getToken() ) {
+ $user->setToken( true );
+ $user->saveSettings();
+ }
}
// Instruct the session providers to kill any other sessions
too.
diff --git a/includes/user/User.php b/includes/user/User.php
index 47e67e5..19333f4 100644
--- a/includes/user/User.php
+++ b/includes/user/User.php
@@ -634,6 +634,7 @@
// No user. Create it?
return $options['create'] ? self::createNew( $name ) :
null;
}
+
$user = self::newFromRow( $row );
// A user is considered to exist as a non-system user if it has
a
--
To view, visit https://gerrit.wikimedia.org/r/265823
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id5b9f27c7814937eb5e71a0a6fb219173325c41a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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
