From 15ecc5a93aec2c49de3fe38990e14095a5725620 Mon Sep 17 00:00:00 2001 From: RobinHood70 Date: Tue, 7 Apr 2015 02:55:31 -0700 Subject: [PATCH] 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 --- includes/api/ApiQueryAllMessages.php | 2 +- includes/api/ApiQueryBacklinksprop.php | 5 ++--- includes/api/ApiQueryCategories.php | 2 +- includes/api/ApiQueryCategoryInfo.php | 2 +- includes/api/ApiQueryContributors.php | 2 +- includes/api/ApiQueryDeletedRevisions.php | 2 +- includes/api/ApiQueryDuplicateFiles.php | 2 +- includes/api/ApiQueryExternalLinks.php | 2 +- includes/api/ApiQueryFileRepoInfo.php | 4 ++++ includes/api/ApiQueryImageInfo.php | 2 +- includes/api/ApiQueryImages.php | 2 +- includes/api/ApiQueryInfo.php | 2 +- includes/api/ApiQueryLangLinks.php | 2 +- includes/api/ApiQueryLinks.php | 4 ++-- includes/api/ApiQueryPageProps.php | 2 +- includes/api/ApiQueryRevisions.php | 2 +- includes/api/ApiQuerySiteinfo.php | 2 +- includes/api/ApiQueryStashImageInfo.php | 4 ++++ includes/api/ApiQueryTokens.php | 4 ++++ includes/api/ApiQueryUserInfo.php | 2 +- 20 files changed, 31 insertions(+), 20 deletions(-) diff --git a/includes/api/ApiQueryAllMessages.php b/includes/api/ApiQueryAllMessages.php index 44af83d03e..cc884ec480 100644 --- a/includes/api/ApiQueryAllMessages.php +++ b/includes/api/ApiQueryAllMessages.php @@ -245,6 +245,6 @@ class ApiQueryAllMessages extends ApiQueryBase { } 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 8e271e7b9a..fe77882915 100644 --- a/includes/api/ApiQueryBacklinksprop.php +++ b/includes/api/ApiQueryBacklinksprop.php @@ -405,8 +405,7 @@ class ApiQueryBacklinksprop extends ApiQueryGeneratorBase { } public function getHelpUrls() { - $name = $this->getModuleName(); - $prefix = $this->getModulePrefix(); - return "https://www.mediawiki.org/wiki/API:Properties#{$name}_.2F_{$prefix}"; + $name = ucfirst( $this->getModuleName() ); + return "https://www.mediawiki.org/wiki/API:{$name}"; } } diff --git a/includes/api/ApiQueryCategories.php b/includes/api/ApiQueryCategories.php index 35fa56efd1..7b3e6e313d 100644 --- a/includes/api/ApiQueryCategories.php +++ b/includes/api/ApiQueryCategories.php @@ -226,6 +226,6 @@ class ApiQueryCategories extends ApiQueryGeneratorBase { } 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 9f6c604496..9266442e3b 100644 --- a/includes/api/ApiQueryCategoryInfo.php +++ b/includes/api/ApiQueryCategoryInfo.php @@ -115,6 +115,6 @@ class ApiQueryCategoryInfo extends ApiQueryBase { } 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 7e76db25cd..4514fa9214 100644 --- a/includes/api/ApiQueryContributors.php +++ b/includes/api/ApiQueryContributors.php @@ -250,6 +250,6 @@ class ApiQueryContributors extends ApiQueryBase { } 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 26ae266843..3a98478803 100644 --- a/includes/api/ApiQueryDeletedRevisions.php +++ b/includes/api/ApiQueryDeletedRevisions.php @@ -299,6 +299,6 @@ class ApiQueryDeletedRevisions extends ApiQueryRevisionsBase { } 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 4d0bcfed31..3282c71775 100644 --- a/includes/api/ApiQueryDuplicateFiles.php +++ b/includes/api/ApiQueryDuplicateFiles.php @@ -189,6 +189,6 @@ class ApiQueryDuplicateFiles extends ApiQueryGeneratorBase { } 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 ec3d9d279e..725ac88b81 100644 --- a/includes/api/ApiQueryExternalLinks.php +++ b/includes/api/ApiQueryExternalLinks.php @@ -134,6 +134,6 @@ class ApiQueryExternalLinks extends ApiQueryBase { } 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 9ad7e27e6b..057b011790 100644 --- a/includes/api/ApiQueryFileRepoInfo.php +++ b/includes/api/ApiQueryFileRepoInfo.php @@ -97,4 +97,8 @@ class ApiQueryFileRepoInfo extends ApiQueryBase { => '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 94b4bbdb48..02846dca64 100644 --- a/includes/api/ApiQueryImageInfo.php +++ b/includes/api/ApiQueryImageInfo.php @@ -795,6 +795,6 @@ class ApiQueryImageInfo extends ApiQueryBase { } 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 029d945d0b..1b39d2827e 100644 --- a/includes/api/ApiQueryImages.php +++ b/includes/api/ApiQueryImages.php @@ -172,6 +172,6 @@ class ApiQueryImages extends ApiQueryGeneratorBase { } 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 66178d4f72..eee5daef65 100644 --- a/includes/api/ApiQueryInfo.php +++ b/includes/api/ApiQueryInfo.php @@ -868,6 +868,6 @@ class ApiQueryInfo extends ApiQueryBase { } 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 5919ee97ea..8f8a17dede 100644 --- a/includes/api/ApiQueryLangLinks.php +++ b/includes/api/ApiQueryLangLinks.php @@ -183,6 +183,6 @@ class ApiQueryLangLinks extends ApiQueryBase { } 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 3bd3714433..d7b85c93bc 100644 --- a/includes/api/ApiQueryLinks.php +++ b/includes/api/ApiQueryLinks.php @@ -42,13 +42,13 @@ class ApiQueryLinks extends ApiQueryGeneratorBase { $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 87f90c5967..1f992f8ff5 100644 --- a/includes/api/ApiQueryPageProps.php +++ b/includes/api/ApiQueryPageProps.php @@ -143,6 +143,6 @@ class ApiQueryPageProps extends ApiQueryBase { } 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 1a65fe38fa..9e02551f76 100644 --- a/includes/api/ApiQueryRevisions.php +++ b/includes/api/ApiQueryRevisions.php @@ -468,6 +468,6 @@ class ApiQueryRevisions extends ApiQueryRevisionsBase { } 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 b81e993b66..98c2201d76 100644 --- a/includes/api/ApiQuerySiteinfo.php +++ b/includes/api/ApiQuerySiteinfo.php @@ -867,6 +867,6 @@ class ApiQuerySiteinfo extends ApiQueryBase { } 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 1126842632..3de72bfe6b 100644 --- a/includes/api/ApiQueryStashImageInfo.php +++ b/includes/api/ApiQueryStashImageInfo.php @@ -122,4 +122,8 @@ class ApiQueryStashImageInfo extends ApiQueryImageInfo { => '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 65a08a3b97..f88766461b 100644 --- a/includes/api/ApiQueryTokens.php +++ b/includes/api/ApiQueryTokens.php @@ -93,4 +93,8 @@ class ApiQueryTokens extends ApiQueryBase { 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 3d3590c54f..4302ef39f5 100644 --- a/includes/api/ApiQueryUserInfo.php +++ b/includes/api/ApiQueryUserInfo.php @@ -274,6 +274,6 @@ class ApiQueryUserInfo extends ApiQueryBase { } public function getHelpUrls() { - return 'https://www.mediawiki.org/wiki/API:Meta#userinfo_.2F_ui'; + return 'https://www.mediawiki.org/wiki/API:Userinfo'; } } -- 2.20.1