Merge branch 'mw-1.26'

1 files changed, 8 insertions, 3 deletions

diff --git a/includes/api/ApiQueryCategoryMembers.php b/includes/api/ApiQueryCategoryMembers.php
index ec0c1d14..6dcfe0eb 100644
--- a/includes/api/ApiQueryCategoryMembers.php
+++ b/includes/api/ApiQueryCategoryMembers.php
@@ -158,7 +158,9 @@ class ApiQueryCategoryMembers extends ApiQueryGeneratorBase {
 					}
 					$startsortkey = pack( 'H*', $params['starthexsortkey'] );
 				} else {
-					$this->logFeatureUsage( 'list=categorymembers&cmstartsortkey' );
+					if ( $params['startsortkey'] !== null ) {
+						$this->logFeatureUsage( 'list=categorymembers&cmstartsortkey' );
+					}
 					$startsortkey = $params['startsortkey'];
 				}
 				if ( $params['endsortkeyprefix'] !== null ) {
@@ -169,7 +171,9 @@ class ApiQueryCategoryMembers extends ApiQueryGeneratorBase {
 					}
 					$endsortkey = pack( 'H*', $params['endhexsortkey'] );
 				} else {
-					$this->logFeatureUsage( 'list=categorymembers&cmendsortkey' );
+					if ( $params['endsortkey'] !== null ) {
+						$this->logFeatureUsage( 'list=categorymembers&cmendsortkey' );
+					}
 					$endsortkey = $params['endsortkey'];
 				}
 
@@ -310,7 +314,8 @@ class ApiQueryCategoryMembers extends ApiQueryGeneratorBase {
 					'sortkeyprefix',
 					'type',
 					'timestamp',
-				)
+				),
+				ApiBase::PARAM_HELP_MSG_PER_VALUE => array(),
 			),
 			'namespace' => array(
 				ApiBase::PARAM_ISMULTI => true,