dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Http::getProxy() method to get proxy configuration"
[lhc/web/wiklou.git]
/
includes
/
api
/
ApiLogout.php
diff --git
a/includes/api/ApiLogout.php
b/includes/api/ApiLogout.php
index
b40f5a3
..
6a26e2e
100644
(file)
--- a/
includes/api/ApiLogout.php
+++ b/
includes/api/ApiLogout.php
@@
-24,6
+24,8
@@
* @file
*/
* @file
*/
+use MediaWiki\Session\BotPasswordSessionProvider;
+
/**
* API module to allow users to log out of the wiki. API equivalent of
* Special:Userlogout.
/**
* API module to allow users to log out of the wiki. API equivalent of
* Special:Userlogout.
@@
-33,8
+35,15
@@
class ApiLogout extends ApiBase {
public function execute() {
class ApiLogout extends ApiBase {
public function execute() {
- // Make sure it's possible to log out
$session = MediaWiki\Session\SessionManager::getGlobalSession();
$session = MediaWiki\Session\SessionManager::getGlobalSession();
+
+ // Handle bot password logout specially
+ if ( $session->getProvider() instanceof BotPasswordSessionProvider ) {
+ $session->unpersist();
+ return;
+ }
+
+ // Make sure it's possible to log out
if ( !$session->canSetUser() ) {
$this->dieUsage(
'Cannot log out when using ' .
if ( !$session->canSetUser() ) {
$this->dieUsage(
'Cannot log out when using ' .
@@
-49,7
+58,7
@@
class ApiLogout extends ApiBase {
// Give extensions to do something after user logout
$injected_html = '';
// Give extensions to do something after user logout
$injected_html = '';
- Hooks::run( 'UserLogoutComplete',
array( &$user, &$injected_html, $oldName )
);
+ Hooks::run( 'UserLogoutComplete',
[ &$user, &$injected_html, $oldName ]
);
}
public function isReadMode() {
}
public function isReadMode() {
@@
-57,10
+66,10
@@
class ApiLogout extends ApiBase {
}
protected function getExamplesMessages() {
}
protected function getExamplesMessages() {
- return
array(
+ return
[
'action=logout'
=> 'apihelp-logout-example-logout',
'action=logout'
=> 'apihelp-logout-example-logout',
-
)
;
+
]
;
}
public function getHelpUrls() {
}
public function getHelpUrls() {