Merge "Avoid master queries on image history view"

diff --cc includes/page/ImagePage.php
index 43b12b2,d7bd568..9b9e3cb
--- 1/includes/page/ImagePage.php
--- 2/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(),