From: Matthew Flaschen <mflaschen@wikimedia.org>
Date: Wed, 26 Mar 2014 03:15:59 +0000 (-0400)
Subject: Fix custom local MediaWiki:Helppage values
X-Git-Tag: 1.31.0-rc.0~16499^2
X-Git-Url: http://git.cyclocoop.org/%24self?a=commitdiff_plain;h=dbede6aad31752fdfe317f7eb66fb1c47c4ec5d4;p=lhc%2Fweb%2Fwiklou.git

Fix custom local MediaWiki:Helppage values

Followup to 3a6ea89d4aa4a0fbc36a209fa13b1c6134110ca9

Change-Id: I7effec352d263f536d1d1763e9cd56d2f5154f13
---

diff --git a/includes/EditPage.php b/includes/EditPage.php
index d4b06fe35e..8f5b31e58c 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -2082,9 +2082,9 @@ class EditPage {
 		}
 		# Try to add a custom edit intro, or use the standard one if this is not possible.
 		if ( !$this->showCustomIntro() && !$this->mTitle->exists() ) {
-			$helpLink = Skin::makeInternalOrExternalUrl(
+			$helpLink = wfExpandUrl( Skin::makeInternalOrExternalUrl(
 				wfMessage( 'helppage' )->inContentLanguage()->text()
-			);
+			) );
 			if ( $wgUser->isLoggedIn() ) {
 				$wgOut->wrapWikiMsg(
 					// Suppress the external link icon, consider the help url an internal one