Anomie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/82863
Change subject: Make CentralAuthUser::deleteGlobalCookies and clearCookie static
......................................................................
Make CentralAuthUser::deleteGlobalCookies and clearCookie static
There's no need for these to be non-static, they don't use any
non-static data or any other non-static methods.
Change-Id: I8282cf706b993c62a7ab38c9ca43cd75601c2043
---
M CentralAuthHooks.php
M CentralAuthUser.php
M specials/SpecialAutoLogin.php
3 files changed, 9 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth
refs/changes/63/82863/1
diff --git a/CentralAuthHooks.php b/CentralAuthHooks.php
index 8df00e9..6dcaa61 100644
--- a/CentralAuthHooks.php
+++ b/CentralAuthHooks.php
@@ -296,7 +296,7 @@
$centralUser = CentralAuthUser::getInstance( $user );
if ( !$centralUser->exists() || !$centralUser->isAttached() ) {
- $centralUser->deleteGlobalCookies();
+ CentralAuthUser::deleteGlobalCookies();
return true;
}
@@ -611,7 +611,7 @@
$centralUser = CentralAuthUser::getInstance( $user );
if ( $centralUser->exists() ) {
- $centralUser->deleteGlobalCookies();
+ CentralAuthUser::deleteGlobalCookies();
$centralUser->resetAuthToken();
}
diff --git a/CentralAuthUser.php b/CentralAuthUser.php
index 81090d9..ac4d7b0 100644
--- a/CentralAuthUser.php
+++ b/CentralAuthUser.php
@@ -2015,7 +2015,7 @@
* @param $name
* @return void
*/
- protected function clearCookie( $name ) {
+ protected static function clearCookie( $name ) {
self::setCookie( $name, '', - 86400 );
}
@@ -2059,7 +2059,7 @@
if ( $remember ) {
self::setCookie( 'Token', $this->getAuthToken(), -1,
$secure );
} else {
- $this->clearCookie( 'Token' );
+ self::clearCookie( 'Token' );
}
$id = self::setSession( $session, $refreshId, $secure );
@@ -2076,10 +2076,10 @@
* Delete global cookies which auto-authenticate the user on other
wikis.
* Called on logout.
*/
- function deleteGlobalCookies() {
- $this->clearCookie( 'User' );
- $this->clearCookie( 'Token' );
- $this->clearCookie( 'Session' );
+ static function deleteGlobalCookies() {
+ self::clearCookie( 'User' );
+ self::clearCookie( 'Token' );
+ self::clearCookie( 'Session' );
// Logged-out cookie -to fix caching.
self::setCookie( 'LoggedOut', time() );
diff --git a/specials/SpecialAutoLogin.php b/specials/SpecialAutoLogin.php
index 87b08a2..1de4311 100644
--- a/specials/SpecialAutoLogin.php
+++ b/specials/SpecialAutoLogin.php
@@ -62,7 +62,7 @@
// Auth OK.
if ( $logout ) {
- $centralUser->deleteGlobalCookies();
+ CentralAuthUser::deleteGlobalCookies();
} else {
$centralUser->setGlobalCookies( $remember );
}
--
To view, visit https://gerrit.wikimedia.org/r/82863
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8282cf706b993c62a7ab38c9ca43cd75601c2043
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Anomie <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
