From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Mon, 21 Sep 2015 09:40:39 +0000 (+0000)
Subject: Merge "Avoid master queries on image history view"
X-Git-Tag: 1.31.0-rc.0~9951
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22brouteur%22%2C%28%24id_rubrique%20?a=commitdiff_plain;h=1b028a6c7491957bb336077fc14bf92d35aa7f73;p=lhc%2Fweb%2Fwiklou.git

Merge "Avoid master queries on image history view"
---

1b028a6c7491957bb336077fc14bf92d35aa7f73
diff --cc includes/page/ImagePage.php
index 43b12b2145,d7bd568486..9b9e3cbdc7
--- a/includes/page/ImagePage.php
+++ b/includes/page/ImagePage.php
@@@ -709,10 -709,10 +709,10 @@@ EO
  		$out->addHTML( "<ul>\n" );
  
  		# "Upload a new version of this file" link
 -		$canUpload = $this->getTitle()->userCan( 'upload', $this->getContext()->getUser() );
 +		$canUpload = $this->getTitle()->quickUserCan( 'upload', $this->getContext()->getUser() );
  		if ( $canUpload && UploadBase::userCanReUpload(
  				$this->getContext()->getUser(),
- 				$this->mPage->getFile()->name )
+ 				$this->mPage->getFile() )
  		) {
  			$ulink = Linker::makeExternalLink(
  				$this->getUploadUrl(),