X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FEditPage.php;h=8f5b31e58c4d7bf2f153ca090a3076dbede39f07;hb=bd7c27990b9ba3e5e2d5e7e70460664a461baa81;hp=3b2f1795119bed7f28e2c3ad0d5f702d97cd31f3;hpb=43b7373b48e210ca38cdc46162f5bfb0e812b277;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 3b2f179511..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
@@ -3463,16 +3463,16 @@ HTML
 			}
 
 			$params = array(
-				$image = $wgStylePath . '/common/images/' . $tool['image'],
+				$wgStylePath . '/common/images/' . $tool['image'],
 				// Note that we use the tip both for the ALT tag and the TITLE tag of the image.
 				// Older browsers show a "speedtip" type message only for ALT.
 				// Ideally these should be different, realistically they
 				// probably don't need to be.
-				$tip = $tool['tip'],
-				$open = $tool['open'],
-				$close = $tool['close'],
-				$sample = $tool['sample'],
-				$cssId = $tool['id'],
+				$tool['tip'],
+				$tool['open'],
+				$tool['close'],
+				$tool['sample'],
+				$tool['id'],
 			);
 
 			$script .= Xml::encodeJsCall( 'mw.toolbar.addButton', $params );