Spage has uploaded a new change for review. https://gerrit.wikimedia.org/r/202368
Change subject: Update getHelpUrls() for reworked mw.org API pages ...................................................................... Update getHelpUrls() for reworked mw.org API pages Community members restructured the mediawiki.org API pages, e.g. the meta allmessages query submodule is no longer in the catch-all https://www.mediawiki.org/wiki/API:Meta?oldid=1408361#allmessages_.2F_am but its own https://www.mediawiki.org/wiki/API:Allmessages The links in the generated API help, e.g. https://www.mediawiki.org/wiki/Special:ApiHelp/query+allmessages, are no correct. They're not 404s but they don't take you directly to the relevant page. This patch set fixes the getHelpUrls() URLs (and does nothing else). I tested them all. Thanks RobinHood70! Change-Id: Icea94abdd22d1ad468172642a21641e7c5ce2046 --- M includes/api/ApiQueryAllMessages.php M includes/api/ApiQueryBacklinksprop.php M includes/api/ApiQueryCategories.php M includes/api/ApiQueryCategoryInfo.php M includes/api/ApiQueryContributors.php M includes/api/ApiQueryDeletedRevisions.php M includes/api/ApiQueryDuplicateFiles.php M includes/api/ApiQueryExternalLinks.php M includes/api/ApiQueryFileRepoInfo.php M includes/api/ApiQueryImageInfo.php M includes/api/ApiQueryImages.php M includes/api/ApiQueryInfo.php M includes/api/ApiQueryLangLinks.php M includes/api/ApiQueryLinks.php M includes/api/ApiQueryPageProps.php M includes/api/ApiQueryRevisions.php M includes/api/ApiQuerySiteinfo.php M includes/api/ApiQueryStashImageInfo.php M includes/api/ApiQueryTokens.php M includes/api/ApiQueryUserInfo.php 20 files changed, 31 insertions(+), 19 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/68/202368/1 diff --git a/includes/api/ApiQueryAllMessages.php b/includes/api/ApiQueryAllMessages.php index 98552ba..66966d9 100644 --- a/includes/api/ApiQueryAllMessages.php +++ b/includes/api/ApiQueryAllMessages.php @@ -245,6 +245,6 @@ } public function getHelpUrls() { - return 'https://www.mediawiki.org/wiki/API:Meta#allmessages_.2F_am'; + return 'https://www.mediawiki.org/wiki/API:Allmessages'; } } diff --git a/includes/api/ApiQueryBacklinksprop.php b/includes/api/ApiQueryBacklinksprop.php index b4752ae..76c6f5e 100644 --- a/includes/api/ApiQueryBacklinksprop.php +++ b/includes/api/ApiQueryBacklinksprop.php @@ -407,6 +407,6 @@ public function getHelpUrls() { $name = $this->getModuleName(); $prefix = $this->getModulePrefix(); - return "https://www.mediawiki.org/wiki/API:Properties#{$name}_.2F_{$prefix}";; + return "https://www.mediawiki.org/wiki/API:{$name}";; } } diff --git a/includes/api/ApiQueryCategories.php b/includes/api/ApiQueryCategories.php index 6aa714e..eb0f13d 100644 --- a/includes/api/ApiQueryCategories.php +++ b/includes/api/ApiQueryCategories.php @@ -226,6 +226,6 @@ } public function getHelpUrls() { - return 'https://www.mediawiki.org/wiki/API:Properties#categories_.2F_cl'; + return 'https://www.mediawiki.org/wiki/API:Categories'; } } diff --git a/includes/api/ApiQueryCategoryInfo.php b/includes/api/ApiQueryCategoryInfo.php index 5c67ebf..e7302cd 100644 --- a/includes/api/ApiQueryCategoryInfo.php +++ b/includes/api/ApiQueryCategoryInfo.php @@ -117,6 +117,6 @@ } public function getHelpUrls() { - return 'https://www.mediawiki.org/wiki/API:Properties#categoryinfo_.2F_ci'; + return 'https://www.mediawiki.org/wiki/API:Categoryinfo'; } } diff --git a/includes/api/ApiQueryContributors.php b/includes/api/ApiQueryContributors.php index 7e76db2..4514fa9 100644 --- a/includes/api/ApiQueryContributors.php +++ b/includes/api/ApiQueryContributors.php @@ -250,6 +250,6 @@ } public function getHelpUrls() { - return 'https://www.mediawiki.org/wiki/API:Properties#contributors_.2F_pc'; + return 'https://www.mediawiki.org/wiki/API:Contributors'; } } diff --git a/includes/api/ApiQueryDeletedRevisions.php b/includes/api/ApiQueryDeletedRevisions.php index 26ae266..3a98478 100644 --- a/includes/api/ApiQueryDeletedRevisions.php +++ b/includes/api/ApiQueryDeletedRevisions.php @@ -299,6 +299,6 @@ } public function getHelpUrls() { - return 'https://www.mediawiki.org/wiki/API:Properties#deletedrevisions_.2F_drv'; + return 'https://www.mediawiki.org/wiki/API:Deletedrevisions'; } } diff --git a/includes/api/ApiQueryDuplicateFiles.php b/includes/api/ApiQueryDuplicateFiles.php index 010f8d5..ef5e5d9 100644 --- a/includes/api/ApiQueryDuplicateFiles.php +++ b/includes/api/ApiQueryDuplicateFiles.php @@ -191,6 +191,6 @@ } public function getHelpUrls() { - return 'https://www.mediawiki.org/wiki/API:Properties#duplicatefiles_.2F_df'; + return 'https://www.mediawiki.org/wiki/API:Duplicatefiles'; } } diff --git a/includes/api/ApiQueryExternalLinks.php b/includes/api/ApiQueryExternalLinks.php index 6ddb6c8..5b3d810 100644 --- a/includes/api/ApiQueryExternalLinks.php +++ b/includes/api/ApiQueryExternalLinks.php @@ -134,6 +134,6 @@ } public function getHelpUrls() { - return 'https://www.mediawiki.org/wiki/API:Properties#extlinks_.2F_el'; + return 'https://www.mediawiki.org/wiki/API:Extlinks'; } } diff --git a/includes/api/ApiQueryFileRepoInfo.php b/includes/api/ApiQueryFileRepoInfo.php index 39c5902..6729065 100644 --- a/includes/api/ApiQueryFileRepoInfo.php +++ b/includes/api/ApiQueryFileRepoInfo.php @@ -95,4 +95,8 @@ => 'apihelp-query+filerepoinfo-example-simple', ); } + + public function getHelpUrls() { + return 'https://www.mediawiki.org/wiki/API:Filerepoinfo'; + } } diff --git a/includes/api/ApiQueryImageInfo.php b/includes/api/ApiQueryImageInfo.php index c4ca5d6..2c59548 100644 --- a/includes/api/ApiQueryImageInfo.php +++ b/includes/api/ApiQueryImageInfo.php @@ -793,6 +793,6 @@ } public function getHelpUrls() { - return 'https://www.mediawiki.org/wiki/API:Properties#imageinfo_.2F_ii'; + return 'https://www.mediawiki.org/wiki/API:Imageinfo'; } } diff --git a/includes/api/ApiQueryImages.php b/includes/api/ApiQueryImages.php index 029d945..1b39d28 100644 --- a/includes/api/ApiQueryImages.php +++ b/includes/api/ApiQueryImages.php @@ -172,6 +172,6 @@ } public function getHelpUrls() { - return 'https://www.mediawiki.org/wiki/API:Properties#images_.2F_im'; + return 'https://www.mediawiki.org/wiki/API:Images'; } } diff --git a/includes/api/ApiQueryInfo.php b/includes/api/ApiQueryInfo.php index 5af44ee..c59a0f4 100644 --- a/includes/api/ApiQueryInfo.php +++ b/includes/api/ApiQueryInfo.php @@ -870,6 +870,6 @@ } public function getHelpUrls() { - return 'https://www.mediawiki.org/wiki/API:Properties#info_.2F_in'; + return 'https://www.mediawiki.org/wiki/API:Info'; } } diff --git a/includes/api/ApiQueryLangLinks.php b/includes/api/ApiQueryLangLinks.php index 2d03347..6426bc5 100644 --- a/includes/api/ApiQueryLangLinks.php +++ b/includes/api/ApiQueryLangLinks.php @@ -183,6 +183,6 @@ } public function getHelpUrls() { - return 'https://www.mediawiki.org/wiki/API:Properties#langlinks_.2F_ll'; + return 'https://www.mediawiki.org/wiki/API:Langlinks'; } } diff --git a/includes/api/ApiQueryLinks.php b/includes/api/ApiQueryLinks.php index 3bd3714..d7b85c9 100644 --- a/includes/api/ApiQueryLinks.php +++ b/includes/api/ApiQueryLinks.php @@ -42,13 +42,13 @@ $this->table = 'pagelinks'; $this->prefix = 'pl'; $this->titlesParam = 'titles'; - $this->helpUrl = 'https://www.mediawiki.org/wiki/API:Properties#links_.2F_pl'; + $this->helpUrl = 'https://www.mediawiki.org/wiki/API:Links'; break; case self::TEMPLATES: $this->table = 'templatelinks'; $this->prefix = 'tl'; $this->titlesParam = 'templates'; - $this->helpUrl = 'https://www.mediawiki.org/wiki/API:Properties#templates_.2F_tl'; + $this->helpUrl = 'https://www.mediawiki.org/wiki/API:Templates'; break; default: ApiBase::dieDebug( __METHOD__, 'Unknown module name' ); diff --git a/includes/api/ApiQueryPageProps.php b/includes/api/ApiQueryPageProps.php index 269afb1..20b34f4 100644 --- a/includes/api/ApiQueryPageProps.php +++ b/includes/api/ApiQueryPageProps.php @@ -136,12 +136,12 @@ protected function getExamplesMessages() { return array( - 'action=query&prop=pageprops&titles=Category:Foo' + 'action=query&prop=pageprops&titles=Category:Main Page|MediaWiki' => 'apihelp-query+pageprops-example-simple', ); } public function getHelpUrls() { - return 'https://www.mediawiki.org/wiki/API:Properties#pageprops_.2F_pp'; + return 'https://www.mediawiki.org/wiki/API:Pageprops'; } } diff --git a/includes/api/ApiQueryRevisions.php b/includes/api/ApiQueryRevisions.php index 552ca3b..48a5956 100644 --- a/includes/api/ApiQueryRevisions.php +++ b/includes/api/ApiQueryRevisions.php @@ -443,6 +443,6 @@ } public function getHelpUrls() { - return 'https://www.mediawiki.org/wiki/API:Properties#revisions_.2F_rv'; + return 'https://www.mediawiki.org/wiki/API:Revisions'; } } diff --git a/includes/api/ApiQuerySiteinfo.php b/includes/api/ApiQuerySiteinfo.php index 5ac1036..7cfe80e 100644 --- a/includes/api/ApiQuerySiteinfo.php +++ b/includes/api/ApiQuerySiteinfo.php @@ -882,6 +882,6 @@ } public function getHelpUrls() { - return 'https://www.mediawiki.org/wiki/API:Meta#siteinfo_.2F_si'; + return 'https://www.mediawiki.org/wiki/API:Siteinfo'; } } diff --git a/includes/api/ApiQueryStashImageInfo.php b/includes/api/ApiQueryStashImageInfo.php index 342e367..97f63e3 100644 --- a/includes/api/ApiQueryStashImageInfo.php +++ b/includes/api/ApiQueryStashImageInfo.php @@ -122,4 +122,8 @@ => 'apihelp-query+stashimageinfo-example-params', ); } + + public function getHelpUrls() { + return 'https://www.mediawiki.org/wiki/API:Stashimageinfo'; + } } diff --git a/includes/api/ApiQueryTokens.php b/includes/api/ApiQueryTokens.php index f8eee8d..64c15b6 100644 --- a/includes/api/ApiQueryTokens.php +++ b/includes/api/ApiQueryTokens.php @@ -91,4 +91,8 @@ public function getCacheMode( $params ) { return 'private'; } + + public function getHelpUrls() { + return 'https://www.mediawiki.org/wiki/API:Tokens'; + } } diff --git a/includes/api/ApiQueryUserInfo.php b/includes/api/ApiQueryUserInfo.php index 1e3a432..e9a74ce 100644 --- a/includes/api/ApiQueryUserInfo.php +++ b/includes/api/ApiQueryUserInfo.php @@ -265,6 +265,6 @@ } public function getHelpUrls() { - return 'https://www.mediawiki.org/wiki/API:Meta#userinfo_.2F_ui'; + return 'https://www.mediawiki.org/wiki/API:Userinfo'; } } -- To view, visit https://gerrit.wikimedia.org/r/202368 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icea94abdd22d1ad468172642a21641e7c5ce2046 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Spage <[email protected]> Gerrit-Reviewer: RobinHood70 <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
