Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/98570
Change subject: Fixed api.php fatals due to protected field usage
......................................................................
Fixed api.php fatals due to protected field usage
bug: 57865
Change-Id: Idafdc353c6b0a2fe6657b3887de4b9d6f1eb1dfd
---
M includes/api/ApiQueryFileRepoInfo.php
1 file changed, 3 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/70/98570/1
diff --git a/includes/api/ApiQueryFileRepoInfo.php
b/includes/api/ApiQueryFileRepoInfo.php
index 148c4dd..dffe301 100644
--- a/includes/api/ApiQueryFileRepoInfo.php
+++ b/includes/api/ApiQueryFileRepoInfo.php
@@ -35,11 +35,7 @@
protected function getInitialisedRepoGroup() {
$repoGroup = RepoGroup::singleton();
-
- if ( !$repoGroup->reposInitialised ) {
- $repoGroup->initialiseRepos();
- }
-
+ $repoGroup->initialiseRepos();
return $repoGroup;
}
@@ -55,7 +51,7 @@
$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 @@
return array_values( array_unique( array_merge(
$props,
- array_keys( $repoGroup->localRepo->getInfo() )
+ array_keys( $repoGroup->getLocalRepo()->getInfo() )
) ) );
}
--
To view, visit https://gerrit.wikimedia.org/r/98570
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idafdc353c6b0a2fe6657b3887de4b9d6f1eb1dfd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <asch...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
