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 "Handle proxy-based TLS when placed in front of Swift"
[lhc/web/wiklou.git]
/
includes
/
api
/
ApiTokens.php
diff --git
a/includes/api/ApiTokens.php
b/includes/api/ApiTokens.php
index
63bae9d
..
fc2951a
100644
(file)
--- a/
includes/api/ApiTokens.php
+++ b/
includes/api/ApiTokens.php
@@
-31,10
+31,10
@@
class ApiTokens extends ApiBase {
public function execute() {
class ApiTokens extends ApiBase {
public function execute() {
- $this->setWarning(
- "action=tokens has been deprecated. Please use action=query&meta=tokens instead."
+ $this->addDeprecation(
+ [ 'apiwarn-deprecation-withreplacement', 'action=tokens', 'action=query&meta=tokens' ],
+ 'action=tokens'
);
);
- $this->logFeatureUsage( "action=tokens" );
$params = $this->extractRequestParams();
$res = [
$params = $this->extractRequestParams();
$res = [
@@
-46,7
+46,7
@@
class ApiTokens extends ApiBase {
$val = call_user_func( $types[$type], null, null );
if ( $val === false ) {
$val = call_user_func( $types[$type], null, null );
if ( $val === false ) {
- $this->
setWarning( "Action '$type' is not allowed for the current user"
);
+ $this->
addWarning( [ 'apiwarn-tokennotallowed', $type ]
);
} else {
$res[$type . 'token'] = $val;
}
} else {
$res[$type . 'token'] = $val;
}