From: Kunal Mehta <legoktm@member.fsf.org>
Date: Tue, 29 May 2018 01:46:12 +0000 (-0700)
Subject: Fix help link on Special:PasswordPolicies
X-Git-Tag: 1.34.0-rc.0~5270^2
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=f7c9ab0bc12eaf2a51cadeb39930f654fc1d853a;p=lhc%2Fweb%2Fwiklou.git

Fix help link on Special:PasswordPolicies

'passwordpolicies-helppage' shouldn't be configured in Git - it's
intended for wikis to set a local override. Instead, set the proper
destination in the addHelpLink() call itself.

As a sidenote, a MediaWiki configuration setting documentation page
isn't the best place for user-facing documentation, a proper help page
should be created in the future.

Bug: T195799
Change-Id: If47b86bbd14f05235fa1cb8c910e2362400d23ac
---

diff --git a/includes/specials/SpecialPasswordPolicies.php b/includes/specials/SpecialPasswordPolicies.php
index 415f973525..0a3a6799a5 100644
--- a/includes/specials/SpecialPasswordPolicies.php
+++ b/includes/specials/SpecialPasswordPolicies.php
@@ -44,7 +44,8 @@ class SpecialPasswordPolicies extends SpecialPage {
 		$out = $this->getOutput();
 		$out->addModuleStyles( 'mediawiki.special' );
 
-		$this->addHelpLink( 'Help:Password policies' );
+		// TODO: Have specific user documentation page for this feature
+		$this->addHelpLink( 'Manual:$wgPasswordPolicy' );
 
 		$out->addHTML(
 			Xml::openElement( 'table', [ 'class' => 'wikitable mw-passwordpolicies-table' ] ) .
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index f36c8edb4a..837e3b5007 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -4472,7 +4472,6 @@
 	"unregistered-user-config": "For security reasons JavaScript, CSS and JSON user subpages cannot be loaded for unregistered users.",
 	"passwordpolicies": "Password policies",
 	"passwordpolicies-summary": "This is a list of the effective password policies for the user groups defined in this wiki.",
-	"passwordpolicies-helppage": "Manual:$wgPasswordPolicy",
 	"passwordpolicies-group": "Group",
 	"passwordpolicies-policies": "Policies",
 	"passwordpolicies-policy-display": "<span class=\"passwordpolicies-policy\">$1 <code>($2)</code></span>",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index 417e0f7b7f..139c91c591 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -4671,7 +4671,6 @@
 	"unregistered-user-config": "Shown when viewing a user JS, CSS or JSON subpage with ?action=raw&ctype=<mime type> where there is no such user. It is shown as a paragraph after a header saying 'Forbidden'.",
 	"passwordpolicies": "The name of the special page [[Special:PasswordPolicies]].",
 	"passwordpolicies-summary": "The description used on [[Special:PasswordPolicies]].\n\nRefers to {{msg-mw|Passwordpolicies-helppage}}.",
-	"passwordpolicies-helppage": "The link used on [[Special:PasswordPolicies]].",
 	"passwordpolicies-group": "The title of the column in the table, about user groups (like you are in the ''translator'' group).\n\n{{Identical|Group}}\n{{Related|Passwordpolicies}}",
 	"passwordpolicies-policies": "The title of the column in the table, about password policies.\n{{Related|Passwordpolicies}}",
 	"passwordpolicies-policy-display": "{{optional}}\nParameters:\n* $1 - the text from the \"passwordpolicies-policy-...\" messages, i.e. {{msg-mw|passwordpolicies-policy-minimalpasswordlength}}\n* $2 - the name of this password policy",