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 "Removed old HTMLCacheUpdateJob b/c code"
[lhc/web/wiklou.git]
/
includes
/
api
/
ApiQueryUsers.php
diff --git
a/includes/api/ApiQueryUsers.php
b/includes/api/ApiQueryUsers.php
index
db8cc1c
..
52636cc
100644
(file)
--- a/
includes/api/ApiQueryUsers.php
+++ b/
includes/api/ApiQueryUsers.php
@@
-67,15
+67,16
@@
class ApiQueryUsers extends ApiQueryBase {
return $this->tokenFunctions;
}
return $this->tokenFunctions;
}
- // If we're in JSON callback mode, no tokens can be obtained
- if ( !is_null( $this->getMain()->getRequest()->getVal( 'callback' ) ) ) {
+ // If we're in a mode that breaks the same-origin policy, no tokens can
+ // be obtained
+ if ( $this->lacksSameOriginSecurity() ) {
return array();
}
$this->tokenFunctions = array(
'userrights' => array( 'ApiQueryUsers', 'getUserrightsToken' ),
);
return array();
}
$this->tokenFunctions = array(
'userrights' => array( 'ApiQueryUsers', 'getUserrightsToken' ),
);
-
wfRunHooks
( 'APIQueryUsersTokens', array( &$this->tokenFunctions ) );
+
Hooks::run
( 'APIQueryUsersTokens', array( &$this->tokenFunctions ) );
return $this->tokenFunctions;
}
return $this->tokenFunctions;
}