X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fpage%2FWikiFilePage.php;h=acd506ba79a041380a722d7a57387a5b51f3f466;hb=d1d179dfa62fe25d75674b2821c47b217509e5d0;hp=c457a34fe1671b6991ecc33d77bbb5a95107ffef;hpb=c2cedf71ee1464f8b4c974906cbca4c8cd80a4e6;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/page/WikiFilePage.php b/includes/page/WikiFilePage.php
index c457a34fe1..acd506ba79 100644
--- a/includes/page/WikiFilePage.php
+++ b/includes/page/WikiFilePage.php
@@ -20,6 +20,7 @@
  * @file
  */
 
+use MediaWiki\MediaWikiServices;
 use Wikimedia\Rdbms\FakeResultWrapper;
 
 /**
@@ -28,13 +29,13 @@ use Wikimedia\Rdbms\FakeResultWrapper;
  * @ingroup Media
  */
 class WikiFilePage extends WikiPage {
-	/** @var File */
+	/** @var File|false */
 	protected $mFile = false;
-	/** @var LocalRepo */
+	/** @var LocalRepo|null */
 	protected $mRepo = null;
 	/** @var bool */
 	protected $mFileLoaded = false;
-	/** @var array */
+	/** @var array|null */
 	protected $mDupes = null;
 
 	public function __construct( $title ) {
@@ -55,14 +56,16 @@ class WikiFilePage extends WikiPage {
 	 * @return bool
 	 */
 	protected function loadFile() {
+		$services = MediaWikiServices::getInstance();
 		if ( $this->mFileLoaded ) {
 			return true;
 		}
 		$this->mFileLoaded = true;
 
-		$this->mFile = wfFindFile( $this->mTitle );
+		$this->mFile = $services->getRepoGroup()->findFile( $this->mTitle );
 		if ( !$this->mFile ) {
-			$this->mFile = wfLocalFile( $this->mTitle ); // always a File
+			$this->mFile = $services->getRepoGroup()->getLocalRepo()
+				->newFile( $this->mTitle ); // always a File
 		}
 		$this->mRepo = $this->mFile->getRepo();
 		return true;
@@ -149,7 +152,7 @@ class WikiFilePage extends WikiPage {
 		$size = $this->mFile->getSize();
 
 		/**
-		 * @var $file File
+		 * @var File $file
 		 */
 		foreach ( $dupes as $index => $file ) {
 			$key = $file->getRepoName() . ':' . $file->getName();