From f6d65e533c62f6deb21342d4901ece24497b433e Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Thu, 4 Jun 2015 07:31:04 +0200 Subject: Update to MediaWiki 1.25.1 --- includes/api/ApiQueryPageProps.php | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) (limited to 'includes/api/ApiQueryPageProps.php') diff --git a/includes/api/ApiQueryPageProps.php b/includes/api/ApiQueryPageProps.php index e370c39f..dd19bf23 100644 --- a/includes/api/ApiQueryPageProps.php +++ b/includes/api/ApiQueryPageProps.php @@ -110,6 +110,7 @@ class ApiQueryPageProps extends ApiQueryBase { * @return bool True if it fits in the result */ private function addPageProps( $result, $page, $props ) { + ApiResult::setArrayType( $props, 'assoc' ); $fit = $result->addValue( array( 'query', 'pages', $page ), 'pageprops', $props ); if ( !$fit ) { @@ -125,28 +126,19 @@ class ApiQueryPageProps extends ApiQueryBase { public function getAllowedParams() { return array( - 'continue' => null, + 'continue' => array( + ApiBase::PARAM_HELP_MSG => 'api-help-param-continue', + ), 'prop' => array( ApiBase::PARAM_ISMULTI => true, ), ); } - public function getParamDescription() { - return array( - 'continue' => 'When more results are available, use this to continue', - 'prop' => 'Only list these props. Useful for checking whether a ' . - 'certain page uses a certain page prop', - ); - } - - public function getDescription() { - return 'Get various properties defined in the page content.'; - } - - public function getExamples() { + protected function getExamplesMessages() { return array( - 'api.php?action=query&prop=pageprops&titles=Category:Foo', + 'action=query&prop=pageprops&titles=Category:Foo' + => 'apihelp-query+pageprops-example-simple', ); } -- cgit v1.2.3-54-g00ecf