From: Purodha B Blissenbach <purodha@users.mediawiki.org>
Date: Mon, 25 May 2009 13:42:47 +0000 (+0000)
Subject: Fix r50972
X-Git-Tag: 1.31.0-rc.0~41660
X-Git-Url: http://git.cyclocoop.org//%22javascript:ModifierStyle%28%27%22.%24id.%22%27%29/%22?a=commitdiff_plain;h=587645f641d120b3665fbe41b7121f12f0634df3;p=lhc%2Fweb%2Fwiklou.git

Fix r50972
---

diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index 0bdc3da8af..04fdd46c00 100644
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -469,17 +469,19 @@ EOT
 			}
 		} else {
 			# Image does not exist
-			$nofile = wfMsgHtml( 'filepage-nofile' );
 			if ( $wgEnableUploads && $wgUser->isAllowed( 'upload' ) ) {
 				// Only show an upload link if the user can upload
-				$nofile .= ' '.$sk->makeKnownLinkObj(
-					SpecialPage::getTitleFor( 'Upload' ),
-					wfMsgHtml('filepage-nofile-link'),
-					'wpDestFile=' . urlencode( $this->displayImg->getName() )
-				);
+                		$uploadTitle = SpecialPage::getTitleFor( 'Upload' );
+				$nofile = wfMsgHtml('filepage-nofile-link',
+					$uploadTitle->getFullUrl( 'wpDestFile=' . urlencode( $this->img->getName() ) )
+					);
+			}
+			else
+			{
+				$nofile = wfMsgHtml( 'filepage-nofile' );
 			}
 			$wgOut->setRobotPolicy( 'noindex,nofollow' );
-			$wgOut->addHTML( '<div id="mw-imagepage-nofile">' . $nofile . '</div>' );
+			$wgOut->addHTML( '<div id="mw-imagepage-nofile" class="plainlinks">' . $nofile . '</div>' );
 		}
 	}
 
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 56695dc794..cf9c88963f 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1998,8 +1998,8 @@ Please see the [$2 file description page] for further information.',
 'sharedupload-desc-here'    => 'This file is from $1 and may be used by other projects.
 The description on its [$2 file description page] there is shown below.',
 'shareddescriptionfollows'  => '-', # do not translate or duplicate this message to other languages
-'filepage-nofile'		=> 'No file by this name exists, but',
-'filepage-nofile-link'		=> 'you can upload it.',
+'filepage-nofile'		=> 'No file by this name exists.',
+'filepage-nofile-link'		=> 'No file by this name exists, but you can [$1 upload it].',
 'uploadnewversion-linktext' => 'Upload a new version of this file',
 'shared-repo-from'          => 'from $1',
 'shared-repo'               => 'a shared repository',