From: Niklas Laxström <nikerabbit@users.mediawiki.org>
Date: Mon, 25 May 2009 14:02:54 +0000 (+0000)
Subject: urlencode not needed anymore
X-Git-Tag: 1.31.0-rc.0~41657
X-Git-Url: https://git.cyclocoop.org/%28%28?a=commitdiff_plain;h=34b5b447309bec823280e591415500a687fe67a3;p=lhc%2Fweb%2Fwiklou.git

urlencode not needed anymore
---

diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index 2fe5d6115b..998899c68d 100644
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -241,8 +241,8 @@ class ImagePage extends Article {
 	 * @return string
 	 */
 	protected function makeMetadataTable( $metadata ) {
-		$r = "<div class=\"mw-imagepage-section-metadata\">\n";
-		$r .= wfMsg( 'metadata-help' );
+		$r = "<div class=\"mw-imagepage-section-metadata\">";
+		$r .= wfMsgNoTrans( 'metadata-help' );
 		$r .= "<table id=\"mw_metadata\" class=\"mw_metadata\">\n";
 		foreach ( $metadata as $type => $stuff ) {
 			foreach ( $stuff as $v ) {
@@ -474,7 +474,7 @@ EOT
 				$uploadTitle = SpecialPage::getTitleFor( 'Upload' );
 				$nofile = wfMsgHtml(
 					'filepage-nofile-link',
-					$uploadTitle->getFullUrl( array( 'wpDestFile' => urlencode( $this->img->getName() ) ) )
+					$uploadTitle->getFullUrl( array( 'wpDestFile' => $this->img->getName() ) )
 				);
 			}
 			else
@@ -518,7 +518,7 @@ EOT
 		$this->loadFile();
 		$uploadTitle = SpecialPage::getTitleFor( 'Upload' );
 		return $uploadTitle->getFullUrl( array(
-			'wpDestFile' => urlencode( $this->img->getName() ),
+			'wpDestFile' => $this->img->getName(),
 			'wpForReUpload' => 1
 		 ) );
 	}