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 "SpecialChangeEmail: Remove cancel button"
[lhc/web/wiklou.git]
/
includes
/
api
/
ApiQuery.php
diff --git
a/includes/api/ApiQuery.php
b/includes/api/ApiQuery.php
index
606012c
..
8407fad
100644
(file)
--- a/
includes/api/ApiQuery.php
+++ b/
includes/api/ApiQuery.php
@@
-108,6
+108,7
@@
class ApiQuery extends ApiBase {
'siteinfo' => 'ApiQuerySiteinfo',
'userinfo' => 'ApiQueryUserInfo',
'filerepoinfo' => 'ApiQueryFileRepoInfo',
'siteinfo' => 'ApiQuerySiteinfo',
'userinfo' => 'ApiQueryUserInfo',
'filerepoinfo' => 'ApiQueryFileRepoInfo',
+ 'tokens' => 'ApiQueryTokens',
);
/**
);
/**
@@
-510,21
+511,22
@@
class ApiQuery extends ApiBase {
$result = array(
'prop' => array(
ApiBase::PARAM_ISMULTI => true,
$result = array(
'prop' => array(
ApiBase::PARAM_ISMULTI => true,
- ApiBase::PARAM_TYPE =>
$this->mModuleMgr->getNames( 'prop' )
+ ApiBase::PARAM_TYPE =>
'submodule',
),
'list' => array(
ApiBase::PARAM_ISMULTI => true,
),
'list' => array(
ApiBase::PARAM_ISMULTI => true,
- ApiBase::PARAM_TYPE =>
$this->mModuleMgr->getNames( 'list' )
+ ApiBase::PARAM_TYPE =>
'submodule',
),
'meta' => array(
ApiBase::PARAM_ISMULTI => true,
),
'meta' => array(
ApiBase::PARAM_ISMULTI => true,
- ApiBase::PARAM_TYPE =>
$this->mModuleMgr->getNames( 'meta' )
+ ApiBase::PARAM_TYPE =>
'submodule',
),
'indexpageids' => false,
'export' => false,
'exportnowrap' => false,
'iwurl' => false,
'continue' => null,
),
'indexpageids' => false,
'export' => false,
'exportnowrap' => false,
'iwurl' => false,
'continue' => null,
+ 'rawcontinue' => false,
);
if ( $flags ) {
$result += $this->getPageSet()->getFinalParams( $flags );
);
if ( $flags ) {
$result += $this->getPageSet()->getFinalParams( $flags );
@@
-607,6
+609,8
@@
class ApiQuery extends ApiBase {
'This parameter is recommended for all new development, and ' .
'will be made default in the next API version.'
),
'This parameter is recommended for all new development, and ' .
'will be made default in the next API version.'
),
+ 'rawcontinue' => 'Currently ignored. In the future, \'continue=\' will become the ' .
+ 'default and this will be needed to receive the raw query-continue data.',
);
}
);
}
@@
-620,13
+624,6
@@
class ApiQuery extends ApiBase {
);
}
);
}
- public function getPossibleErrors() {
- return array_merge(
- parent::getPossibleErrors(),
- $this->getPageSet()->getFinalPossibleErrors()
- );
- }
-
public function getExamples() {
return array(
'api.php?action=query&prop=revisions&meta=siteinfo&' .
public function getExamples() {
return array(
'api.php?action=query&prop=revisions&meta=siteinfo&' .