[MediaWiki-commits] [Gerrit] Making sure state is loaded before resetting the auth token - change (mediawiki...CentralAuth)

2013-05-10 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Making sure state is loaded before resetting the auth token
..


Making sure state is loaded before resetting the auth token

Change-Id: I4c07451cb93cce6008fcc7c23705a813c05bc18e
---
M CentralAuthUser.php
1 file changed, 3 insertions(+), 0 deletions(-)

Approvals:
  CSteipp: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/CentralAuthUser.php b/CentralAuthUser.php
index 7077639..8acbf7e 100644
--- a/CentralAuthUser.php
+++ b/CentralAuthUser.php
@@ -2061,6 +2061,9 @@
 * not randomly log users out (so on logout, as is done currently, is a 
good time).
 */
function resetAuthToken() {
+   // Load state, since its hard to reset the token without it
+   $this-loadState();
+
// Generate a random token.
$this-mAuthToken = MWCryptRand::generateHex( 32 );
$this-mStateDirty = true;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4c07451cb93cce6008fcc7c23705a813c05bc18e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Pgehres pgeh...@wikimedia.org
Gerrit-Reviewer: CSteipp cste...@wikimedia.org
Gerrit-Reviewer: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Making sure state is loaded before resetting the auth token - change (mediawiki...CentralAuth)

2013-05-09 Thread Pgehres (Code Review) 
Pgehres has uploaded a new change for review.

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


Change subject: Making sure state is loaded before resetting the auth token
..

Making sure state is loaded before resetting the auth token

Change-Id: I4c07451cb93cce6008fcc7c23705a813c05bc18e
---
M CentralAuthUser.php
1 file changed, 3 insertions(+), 0 deletions(-)


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

diff --git a/CentralAuthUser.php b/CentralAuthUser.php
index 7077639..8acbf7e 100644
--- a/CentralAuthUser.php
+++ b/CentralAuthUser.php
@@ -2061,6 +2061,9 @@
 * not randomly log users out (so on logout, as is done currently, is a 
good time).
 */
function resetAuthToken() {
+   // Load state, since its hard to reset the token without it
+   $this-loadState();
+
// Generate a random token.
$this-mAuthToken = MWCryptRand::generateHex( 32 );
$this-mStateDirty = true;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4c07451cb93cce6008fcc7c23705a813c05bc18e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Pgehres pgeh...@wikimedia.org

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