Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/131025
Change subject: Set SiteStore in SpecialSetSiteLink constructor
......................................................................
Set SiteStore in SpecialSetSiteLink constructor
Change-Id: Ie50108c2d218441bc8ef9b423cd2b7876681ca76
---
M repo/includes/specials/SpecialSetSiteLink.php
1 file changed, 9 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/25/131025/1
diff --git a/repo/includes/specials/SpecialSetSiteLink.php
b/repo/includes/specials/SpecialSetSiteLink.php
index 0f23643..e0529a2 100644
--- a/repo/includes/specials/SpecialSetSiteLink.php
+++ b/repo/includes/specials/SpecialSetSiteLink.php
@@ -77,6 +77,11 @@
private $badgeItems;
/**
+ * SiteStore
+ */
+ private $siteStore;
+
+ /**
* @since 0.4
*/
public function __construct() {
@@ -90,6 +95,7 @@
// @todo inject the dependencies
$this->entityIdParser =
WikibaseRepo::getDefaultInstance()->getEntityIdParser();
$this->badgeItems = $settings->getSetting( 'badgeItems' );
+ $this->siteStore = SiteSQLStore::newInstance();
}
/**
@@ -213,7 +219,7 @@
* @return bool
*/
private function isValidSiteId( $siteId ) {
- return $siteId !== null &&
SiteSQLStore::newInstance()->getSite( $siteId ) !== null;
+ return $siteId !== null && $this->siteStore->getSite( $siteId )
!== null;
}
/**
@@ -266,7 +272,7 @@
);
}
- $site = SiteSQLStore::newInstance()->getSite( $this->site );
+ $site = $this->siteStore->getSite( $this->site );
if ( $entity !== null && $this->site !== null && $site !== null
) {
return Html::rawElement(
@@ -451,7 +457,7 @@
*/
protected function setSiteLink( Item $item, $siteId, $pageName,
$badges, &$summary ) {
$status = Status::newGood();
- $site = SiteSQLStore::newInstance()->getSite( $siteId );
+ $site = $this->siteStore->getSite( $siteId );
if ( $site === null ) {
$status->fatal( 'wikibase-setsitelink-invalid-site',
$siteId );
--
To view, visit https://gerrit.wikimedia.org/r/131025
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie50108c2d218441bc8ef9b423cd2b7876681ca76
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
