X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fapi%2FApiQueryUsers.php;h=52636ccdd62f8d570217be008b89319e7fd3e125;hb=b7f15ca61550b36177d5d9f15b30dfd9c9b5ee15;hp=2f5e4b4bf866b971e8d74454acefb8cd1a15380b;hpb=e6e68618810b828a7de84dfe164e768da8ba90bf;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/api/ApiQueryUsers.php b/includes/api/ApiQueryUsers.php
index 2f5e4b4bf8..52636ccdd6 100644
--- a/includes/api/ApiQueryUsers.php
+++ b/includes/api/ApiQueryUsers.php
@@ -67,15 +67,16 @@ class ApiQueryUsers extends ApiQueryBase {
 			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' ),
 		);
-		wfRunHooks( 'APIQueryUsersTokens', array( &$this->tokenFunctions ) );
+		Hooks::run( 'APIQueryUsersTokens', array( &$this->tokenFunctions ) );
 
 		return $this->tokenFunctions;
 	}
@@ -277,19 +278,6 @@ class ApiQueryUsers extends ApiQueryBase {
 		$result->setIndexedTagName_internal( array( 'query', $this->getModuleName() ), 'user' );
 	}
 
-	/**
-	 * Gets all the groups that a user is automatically a member of (implicit groups)
-	 *
-	 * @deprecated since 1.20; call User::getAutomaticGroups() directly.
-	 * @param User $user
-	 * @return array
-	 */
-	public static function getAutoGroups( $user ) {
-		wfDeprecated( __METHOD__, '1.20' );
-
-		return $user->getAutomaticGroups();
-	}
-
 	public function getCacheMode( $params ) {
 		if ( isset( $params['token'] ) ) {
 			return 'private';
@@ -327,33 +315,13 @@ class ApiQueryUsers extends ApiQueryBase {
 		);
 	}
 
-	public function getParamDescription() {
+	protected function getExamplesMessages() {
 		return array(
-			'prop' => array(
-				'What pieces of information to include',
-				'  blockinfo      - Tags if the user is blocked, by whom, and for what reason',
-				'  groups         - Lists all the groups the user(s) belongs to',
-				'  implicitgroups - Lists all the groups a user is automatically a member of',
-				'  rights         - Lists all the rights the user(s) has',
-				'  editcount      - Adds the user\'s edit count',
-				'  registration   - Adds the user\'s registration timestamp',
-				'  emailable      - Tags if the user can and wants to receive ' .
-					'email through [[Special:Emailuser]]',
-				'  gender         - Tags the gender of the user. Returns "male", "female", or "unknown"',
-			),
-			'users' => 'A list of users to obtain the same information for',
-			'token' => 'Which tokens to obtain for each user',
+			'action=query&list=users&ususers=Example&usprop=groups|editcount|gender'
+				=> 'apihelp-query+users-example-simple',
 		);
 	}
 
-	public function getDescription() {
-		return 'Get information about a list of users.';
-	}
-
-	public function getExamples() {
-		return 'api.php?action=query&list=users&ususers=brion|TimStarling&usprop=groups|editcount|gender';
-	}
-
 	public function getHelpUrls() {
 		return 'https://www.mediawiki.org/wiki/API:Users';
 	}