From: Alex Monk <krenair@gmail.com>
Date: Mon, 13 Aug 2012 20:15:53 +0000 (+0100)
Subject: (bug 24491) Don't show reupload link if the user can't upload because of protection
X-Git-Tag: 1.31.0-rc.0~22642
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmes_infos.php?a=commitdiff_plain;h=d04502b698cc42e99cf24a73ac58847b6f1f2e77;p=lhc%2Fweb%2Fwiklou.git

(bug 24491) Don't show reupload link if the user can't upload because of protection

Instead, show some text explaining that they cannot upload here.

Also remove a linebreak which someone complained about recently.

Change-Id: I92ab8ad5eebcdd38c0d5d9f7bab7d11e5c844586
---

diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index dad10c85a5..7aed39221e 100644
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -654,12 +654,15 @@ EOT
 		}
 
 		$out = $this->getContext()->getOutput();
-		$out->addHTML( "<br /><ul>\n" );
+		$out->addHTML( "<ul>\n" );
 
 		# "Upload a new version of this file" link
-		if ( UploadBase::userCanReUpload( $this->getContext()->getUser(), $this->mPage->getFile()->name ) ) {
+		$canUpload = $this->getTitle()->userCan( 'upload', $this->getContext()->getUser() );
+		if ( $canUpload && UploadBase::userCanReUpload( $this->getContext()->getUser(), $this->mPage->getFile()->name ) ) {
 			$ulink = Linker::makeExternalLink( $this->getUploadUrl(), wfMessage( 'uploadnewversion-linktext' )->text() );
 			$out->addHTML( "<li id=\"mw-imagepage-reupload-link\"><div class=\"plainlinks\">{$ulink}</div></li>\n" );
+		} else {
+			$out->addHTML( "<li id=\"mw-imagepage-upload-disallowed\">" . $this->msg( 'upload-disallowed-here' )->escaped() . "</li>\n" );
 		}
 
 		# External editing link
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index a66db049e8..8704148672 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2459,6 +2459,7 @@ Maybe you want to edit the description on its [$2 file description page] there.'
 'shared-repo'                       => 'a shared repository',
 'shared-repo-name-wikimediacommons' => 'Wikimedia Commons', # only translate this message to other languages if you have to change it
 'filepage.css'                      => '/* CSS placed here is included on the file description page, also included on foreign client wikis */', # only translate this message to other languages if you have to change it
+'upload-disallowed-here'            => 'Unfortunately you cannot overwrite this image.',
 
 # File reversion
 'filerevert'                => 'Revert $1',
diff --git a/languages/messages/MessagesQqq.php b/languages/messages/MessagesQqq.php
index bfe383ef02..570f4ff2c7 100644
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -2219,6 +2219,7 @@ $1 is the name of the shared repository. On wikimedia sites, $1 is {{msg-mw|shar
 * {{msg-mw|sharedupload}}, {{msg-mw|sharedupload-desc-here}}, {{msg-mw|sharedupload-desc-there}}',
 'shared-repo-name-wikimediacommons' => '{{optional}}',
 'filepage.css' => '{{Optional}}',
+'upload-disallowed-here'            => 'This message appears on an image page in place of the normal reupload link if they cannot upload - e.g. if the image page is upload protected and they do not have the right priviledge.',
 
 # File reversion
 'filerevert' => '{{Identical|Revert}}',
diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 59e15a8a72..33c104b1fb 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -1535,6 +1535,7 @@ $wgMessageStructure = array(
 		'shared-repo',
 		'shared-repo-name-wikimediacommons',
 		'filepage.css',
+		'upload-disallowed-here',
 	),
 	'filerevert' => array(
 		'filerevert',