X-Git-Url: https://git.cyclocoop.org/%20%27.%28%24debut%20%20%20%24par_page%29.%27?a=blobdiff_plain;f=includes%2Fpage%2FImagePage.php;h=bb15532c1e5712cae5647e2aac4bbba5f023d1ec;hb=9579fb0605dd490f55e7d2bec5216951ada6dde8;hp=2e43e8c53bfb9c285bb76540f8e217ae4d72a3e9;hpb=f9bb20657c6776a7543fbf33ead1c1e6fbad33de;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/page/ImagePage.php b/includes/page/ImagePage.php
index 2e43e8c53b..bb15532c1e 100644
--- a/includes/page/ImagePage.php
+++ b/includes/page/ImagePage.php
@@ -27,6 +27,9 @@ use Wikimedia\Rdbms\ResultWrapper;
  * Class for viewing MediaWiki file description pages
  *
  * @ingroup Media
+ *
+ * @property WikiFilePage $mPage Set by overwritten newPage() in this class
+ * @method WikiFilePage getPage()
  */
 class ImagePage extends Article {
 	/** @var File|false */
@@ -41,11 +44,6 @@ class ImagePage extends Article {
 	/** @var bool */
 	protected $mExtraDescription = false;
 
-	/**
-	 * @var WikiFilePage
-	 */
-	protected $mPage;
-
 	/**
 	 * @param Title $title
 	 * @return WikiFilePage
@@ -605,7 +603,10 @@ EOT
 				);
 			}
 
-			if ( $wgEnableUploads && $user->isAllowed( 'upload' ) ) {
+			if ( $wgEnableUploads && MediaWikiServices::getInstance()
+					->getPermissionManager()
+					->userHasRight( $user, 'upload' )
+			) {
 				// Only show an upload link if the user can upload
 				$uploadTitle = SpecialPage::getTitleFor( 'Upload' );
 				$nofile = [
@@ -989,6 +990,7 @@ EOT
 			parent::delete();
 			return;
 		}
+		'@phan-var LocalFile $file';
 
 		$deleter = new FileDeleteForm( $file );
 		$deleter->execute();