From: Aaron Schulz <aschulz@wikimedia.org>
Date: Mon, 2 Dec 2013 18:52:10 +0000 (-0800)
Subject: Fixed api.php fatals due to protected field usage
X-Git-Tag: 1.31.0-rc.0~17831^2
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/password.php?a=commitdiff_plain;h=32e4c61397af3aaa389eb6a460f11c59ef76fd8f;p=lhc%2Fweb%2Fwiklou.git

Fixed api.php fatals due to protected field usage

bug: 57865
Change-Id: Idafdc353c6b0a2fe6657b3887de4b9d6f1eb1dfd
---

diff --git a/includes/api/ApiQueryFileRepoInfo.php b/includes/api/ApiQueryFileRepoInfo.php
index 148c4ddde9..dffe3019cd 100644
--- a/includes/api/ApiQueryFileRepoInfo.php
+++ b/includes/api/ApiQueryFileRepoInfo.php
@@ -35,11 +35,7 @@ class ApiQueryFileRepoInfo extends ApiQueryBase {
 
 	protected function getInitialisedRepoGroup() {
 		$repoGroup = RepoGroup::singleton();
-
-		if ( !$repoGroup->reposInitialised ) {
-			$repoGroup->initialiseRepos();
-		}
-
+		$repoGroup->initialiseRepos();
 		return $repoGroup;
 	}
 
@@ -55,7 +51,7 @@ class ApiQueryFileRepoInfo extends ApiQueryBase {
 			$repos[] = array_intersect_key( $repo->getInfo(), $props );
 		} );
 
-		$repos[] = array_intersect_key( $repoGroup->localRepo->getInfo(), $props );
+		$repos[] = array_intersect_key( $repoGroup->getLocalRepo()->getInfo(), $props );
 
 		$result = $this->getResult();
 		$result->setIndexedTagName( $repos, 'repo' );
@@ -88,7 +84,7 @@ class ApiQueryFileRepoInfo extends ApiQueryBase {
 
 		return array_values( array_unique( array_merge(
 			$props,
-			array_keys( $repoGroup->localRepo->getInfo() )
+			array_keys( $repoGroup->getLocalRepo()->getInfo() )
 		) ) );
 	}