Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/75335
Change subject: fix site link section link for site group and use sites table
for this
......................................................................
fix site link section link for site group and use sites table for this
- now, the siteGroup setting is unused and removed.
Change-Id: Ie17f2af0900743011cbae6397d2e36622e9f1614
---
M client/WikibaseClient.hooks.php
M client/config/WikibaseClient.default.php
2 files changed, 10 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/35/75335/1
diff --git a/client/WikibaseClient.hooks.php b/client/WikibaseClient.hooks.php
index 38d09cb..c187182 100644
--- a/client/WikibaseClient.hooks.php
+++ b/client/WikibaseClient.hooks.php
@@ -5,6 +5,7 @@
use RecursiveDirectoryIterator;
use RecursiveIteratorIterator;
use SplFileInfo;
+use SiteSQLStore;
use Wikibase\Client\WikibaseClient;
use Wikibase\Client\MovePageNotice;
use Wikibase\DataModel\SimpleSiteLink;
@@ -591,12 +592,20 @@
$repoLinker =
WikibaseClient::getDefaultInstance()->newRepoLinker();
$entityIdParser =
WikibaseClient::getDefaultInstance()->getEntityIdParser();
+ $siteId = Settings::get( 'siteGlobalID' );
+ $site = SiteSQLStore::newInstance()->getSite( $siteId );
+
+ if ( !$site ) {
+ wfWarn( 'Cannot find site in sites table' );
+ return true;
+ }
+
$editLinkInjector = new RepoItemLinkGenerator(
$namespaceChecker,
$repoLinker,
$entityIdParser,
Settings::get( 'enableSiteLinkWidget' ),
- Settings::get( 'siteGroup' )
+ $site->getGroup()
);
$action = \Action::getActionName( $skin->getContext() );
diff --git a/client/config/WikibaseClient.default.php
b/client/config/WikibaseClient.default.php
index 31ab62c..0c445d7 100644
--- a/client/config/WikibaseClient.default.php
+++ b/client/config/WikibaseClient.default.php
@@ -59,8 +59,6 @@
'enableSiteLinkWidget' => true,
'propagateChangesToRepo' => true,
- 'siteGroup' => 'wikipedia', //TODO: require this to be set,
default doesn't make sense.
-
/**
* @todo this is a bit wikimedia-specific and need to find a
better place for this stuff,
* such as mediawiki-config, mediawiki messages for custom
orders, or somewhere.
--
To view, visit https://gerrit.wikimedia.org/r/75335
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie17f2af0900743011cbae6397d2e36622e9f1614
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude <aude.w...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
