dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Use ResourceLoader::makeComment to embed page title in wiki modules"
[lhc/web/wiklou.git]
/
includes
/
api
/
ApiQueryFileRepoInfo.php
diff --git
a/includes/api/ApiQueryFileRepoInfo.php
b/includes/api/ApiQueryFileRepoInfo.php
index
148c4dd
..
d9579a1
100644
(file)
--- a/
includes/api/ApiQueryFileRepoInfo.php
+++ b/
includes/api/ApiQueryFileRepoInfo.php
@@
-35,10
+35,7
@@
class ApiQueryFileRepoInfo extends ApiQueryBase {
protected function getInitialisedRepoGroup() {
$repoGroup = RepoGroup::singleton();
protected function getInitialisedRepoGroup() {
$repoGroup = RepoGroup::singleton();
-
- if ( !$repoGroup->reposInitialised ) {
- $repoGroup->initialiseRepos();
- }
+ $repoGroup->initialiseRepos();
return $repoGroup;
}
return $repoGroup;
}
@@
-55,7
+52,7
@@
class ApiQueryFileRepoInfo extends ApiQueryBase {
$repos[] = array_intersect_key( $repo->getInfo(), $props );
} );
$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' );
$result = $this->getResult();
$result->setIndexedTagName( $repos, 'repo' );
@@
-88,7
+85,7
@@
class ApiQueryFileRepoInfo extends ApiQueryBase {
return array_values( array_unique( array_merge(
$props,
return array_values( array_unique( array_merge(
$props,
- array_keys( $repoGroup->
localRepo
->getInfo() )
+ array_keys( $repoGroup->
getLocalRepo()
->getInfo() )
) ) );
}
) ) );
}