Lucie Kaffee has uploaded a new change for review.
https://gerrit.wikimedia.org/r/162859
Change subject: Update MergeItem's method getParamDescription
......................................................................
Update MergeItem's method getParamDescription
In order to match the ApiConventions Test, updated the first api module.
Bug:69739
Change-Id: Ic8e0e4b91a190134b2364a48f766e9661a856bfd
---
M repo/includes/api/MergeItems.php
1 file changed, 13 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/59/162859/1
diff --git a/repo/includes/api/MergeItems.php b/repo/includes/api/MergeItems.php
index bd29918..87737a4 100644
--- a/repo/includes/api/MergeItems.php
+++ b/repo/includes/api/MergeItems.php
@@ -208,22 +208,19 @@
* @see ApiBase::getParamDescription
*/
public function getParamDescription() {
- return array_merge(
- parent::getParamDescription(),
- array(
- 'fromid' => array( 'The id to merge from' ),
- 'toid' => array( 'The id to merge to' ),
- 'ignoreconflicts' => array( 'Array of elements
of the item to ignore conflicts for, can only contain values of "label" and or
"description" and or "sitelink"' ),
- 'token' => 'An "edittoken" token previously
obtained through the token module (prop=info).',
- 'summary' => array( 'Summary for the edit.',
- "Will be prepended by an automatically
generated comment. The length limit of the
- autocomment together with the summary
is 260 characters. Be aware that everything above that
- limit will be cut off."
- ),
- 'bot' => array( 'Mark this edit as bot',
- 'This URL flag will only be respected
if the user belongs to the group "bot".'
- ),
- )
+ return array(
+ 'fromid' => array( 'The id to merge from' ),
+ 'toid' => array( 'The id to merge to' ),
+ 'ignoreconflicts' => array( 'Array of elements of the
item to ignore conflicts for, can only contain values of "label" and or
"description" and or "sitelink"' ),
+ 'token' => 'An "edittoken" token previously obtained
through the token module (prop=info).',
+ 'summary' => array( 'Summary for the edit.',
+ "Will be prepended by an automatically
generated comment. The length limit of the
+ autocomment together with the summary is 260
characters. Be aware that everything above that
+ limit will be cut off."
+ ),
+ 'bot' => array( 'Mark this edit as bot',
+ 'This URL flag will only be respected if the
user belongs to the group "bot".'
+ ),
);
}
--
To view, visit https://gerrit.wikimedia.org/r/162859
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic8e0e4b91a190134b2364a48f766e9661a856bfd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Lucie Kaffee <lucie.kaf...@wikimedia.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
