X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Fapi%2FApiQueryTokens.php;h=5b700dbc9c0dc6d0f7696386cd38c47163f6ccae;hb=872dc01de3bfae0db3f952b75b95d98beb47449e;hp=cc829aa8a137fe827c819937b08bd1c6002feaef;hpb=d716155c8b2d6e4a51a4110195cee7a1794846e8;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/api/ApiQueryTokens.php b/includes/api/ApiQueryTokens.php
index cc829aa8a1..5b700dbc9c 100644
--- a/includes/api/ApiQueryTokens.php
+++ b/includes/api/ApiQueryTokens.php
@@ -40,7 +40,7 @@ class ApiQueryTokens extends ApiQueryBase {
 		];
 
 		if ( $this->lacksSameOriginSecurity() ) {
-			$this->setWarning( 'Tokens may not be obtained when the same-origin policy is not applied' );
+			$this->addWarning( [ 'apiwarn-tokens-origin' ] );
 			return;
 		}
 
@@ -59,7 +59,7 @@ class ApiQueryTokens extends ApiQueryBase {
 	 * @return (string|array)[] Returning a string will use that as the salt
 	 *  for User::getEditTokenObject() to fetch the token, which will give a
 	 *  LoggedOutEditToken (always "+\\") for anonymous users. Returning an
-	 *  array will use it as parameters to MediaWiki\\Session\\Session::getToken(),
+	 *  array will use it as parameters to MediaWiki\Session\Session::getToken(),
 	 *  which will always return a full token even for anonymous users.
 	 */
 	public static function getTokenTypeSalts() {
@@ -84,14 +84,14 @@ class ApiQueryTokens extends ApiQueryBase {
 	/**
 	 * Get a token from a salt
 	 * @param User $user
-	 * @param MediaWiki\\Session\\Session $session
+	 * @param MediaWiki\Session\Session $session
 	 * @param string|array $salt A string will be used as the salt for
 	 *  User::getEditTokenObject() to fetch the token, which will give a
 	 *  LoggedOutEditToken (always "+\\") for anonymous users. An array will
-	 *  be used as parameters to MediaWiki\\Session\\Session::getToken(), which
+	 *  be used as parameters to MediaWiki\Session\Session::getToken(), which
 	 *  will always return a full token even for anonymous users. An array will
 	 *  also persist the session.
-	 * @return MediaWiki\\Session\\Token
+	 * @return MediaWiki\Session\Token
 	 */
 	public static function getToken( User $user, MediaWiki\Session\Session $session, $salt ) {
 		if ( is_array( $salt ) ) {