diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:30:02 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:30:02 -0400 |
| commit | 1de335ad3f395ca6861085393ba366a9e3fb4a0d (patch) | |
| tree | f1fdd326034e05177596851be6a7127615d81498 /includes/api/ApiQueryORM.php | |
| parent | 9c75fa8ff6d4d38ef552c00fef5969fb154765e8 (diff) | |
| parent | f6d65e533c62f6deb21342d4901ece24497b433e (diff) | |
Merge commit 'f6d65'
# Conflicts:
# skins/ArchLinux/ArchLinux.php
Diffstat (limited to 'includes/api/ApiQueryORM.php')
| -rw-r--r-- | includes/api/ApiQueryORM.php | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/includes/api/ApiQueryORM.php b/includes/api/ApiQueryORM.php index 469b2972..dc10c91c 100644 --- a/includes/api/ApiQueryORM.php +++ b/includes/api/ApiQueryORM.php @@ -205,7 +205,7 @@ abstract class ApiQueryORM extends ApiQueryBase { * @param array $serializedResults */ protected function setIndexedTagNames( array &$serializedResults ) { - $this->getResult()->setIndexedTagName( $serializedResults, $this->getRowName() ); + ApiResult::setIndexedTagName( $serializedResults, $this->getRowName() ); } /** @@ -233,15 +233,19 @@ abstract class ApiQueryORM extends ApiQueryBase { ApiBase::PARAM_TYPE => $this->getTable()->getFieldNames(), ApiBase::PARAM_ISMULTI => true, ApiBase::PARAM_REQUIRED => true, + ApiBase::PARAM_HELP_MSG => 'api-orm-param-props', ), 'limit' => array( ApiBase::PARAM_DFLT => 20, ApiBase::PARAM_TYPE => 'limit', ApiBase::PARAM_MIN => 1, ApiBase::PARAM_MAX => ApiBase::LIMIT_BIG1, - ApiBase::PARAM_MAX2 => ApiBase::LIMIT_BIG2 + ApiBase::PARAM_MAX2 => ApiBase::LIMIT_BIG2, + ApiBase::PARAM_HELP_MSG => 'api-orm-param-limit', + ), + 'continue' => array( + ApiBase::PARAM_HELP_MSG => 'api-help-param-continue', ), - 'continue' => null, ); return array_merge( $this->getTable()->getAPIParams(), $params ); @@ -249,6 +253,7 @@ abstract class ApiQueryORM extends ApiQueryBase { /** * @see ApiBase::getParamDescription() + * @deprecated since 1.25 * @return array */ public function getParamDescription() { |