X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fpage%2FImagePage.php;h=b60b0108a11ca38b1f55e51bd047c769b0662bee;hb=bfce465c0f50332b717fe20882d7c617959ca386;hp=af778682c7323ac4bfe9f4591d5ac6f028faf1aa;hpb=597a2063db031b95658abd3e12a2a13bce678f55;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/page/ImagePage.php b/includes/page/ImagePage.php
index af778682c7..b60b0108a1 100644
--- a/includes/page/ImagePage.php
+++ b/includes/page/ImagePage.php
@@ -69,6 +69,7 @@ class ImagePage extends Article {
 		$this->fileLoaded = true;
 
 		$this->displayImg = $img = false;
+
 		Hooks::run( 'ImagePageFindFile', [ $this, &$img, &$this->displayImg ] );
 		if ( !$img ) { // not set by hook?
 			$img = wfFindFile( $this->getTitle() );
@@ -215,7 +216,6 @@ class ImagePage extends Article {
 			'filepage', // always show the local local Filepage.css, bug 29277
 			'mediawiki.action.view.filepage', // Add MediaWiki styles for a file page
 		] );
-
 	}
 
 	/**
@@ -336,7 +336,10 @@ class ImagePage extends Article {
 			$filename = wfEscapeWikiText( $this->displayImg->getName() );
 			$linktext = $filename;
 
-			Hooks::run( 'ImageOpenShowImageInlineBefore', [ &$this, &$out ] );
+			// Use of &$this in hooks triggers warnings in PHP 7.1
+			$imagePage = $this;
+
+			Hooks::run( 'ImageOpenShowImageInlineBefore', [ &$imagePage, &$out ] );
 
 			if ( $this->displayImg->allowInlineDisplay() ) {
 				# image