jenkins-bot has submitted this change and it was merged.

Change subject: Display links to Wikidata in the other project sidebar
......................................................................


Display links to Wikidata in the other project sidebar

Task: T76002
Change-Id: I3c96e3300176b1782857d4c63334df097cc022c9
---
M wmf-config/Wikibase.php
1 file changed, 23 insertions(+), 32 deletions(-)

Approvals:
  Manybubbles: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/Wikibase.php b/wmf-config/Wikibase.php
index 8324e00..2d5b060 100644
--- a/wmf-config/Wikibase.php
+++ b/wmf-config/Wikibase.php
@@ -17,6 +17,25 @@
        $wgWBSharedCacheKey .= '-hhvm';
 }
 
+$wgWBSharedSettings = array();
+
+$wgWBSharedSettings['siteLinkGroups'] = array(
+       'wikipedia',
+       'wikinews',
+       'wikiquote',
+       'wikisource',
+       'wikivoyage',
+       'special'
+);
+
+$wgWBSharedSettings['specialSiteLinkGroups'] = array( 'commons' );
+if ( in_array( $wgDBname, array( 'test2wiki', 'testwiki', 'testwikidatawiki' ) 
) ) {
+       $wgWBSharedSettings['specialSiteLinkGroups'][] = 'testwikidata';
+} else {
+       $wgWBSharedSettings['specialSiteLinkGroups'][] = 'wikidata';
+}
+
+
 if ( $wmgUseWikibaseRepo ) {
        $baseNs = 120;
 
@@ -35,6 +54,8 @@
        $wgExtraNamespaces[WB_NS_QUERY] = 'Query';
        $wgExtraNamespaces[WB_NS_QUERY_TALK] = 'Query_talk';
 
+       $wgWBRepoSettings = $wgWBSharedSettings + $wgWBRepoSettings;
+
        // Assigning the correct content models to the namespaces
        $wgWBRepoSettings['entityNamespaces'][CONTENT_MODEL_WIKIBASE_ITEM] = 
NS_MAIN;
        $wgWBRepoSettings['entityNamespaces'][CONTENT_MODEL_WIKIBASE_PROPERTY] 
= WB_NS_PROPERTY;
@@ -44,20 +65,7 @@
        $wgWBRepoSettings['dataRightsText'] = 'Creative Commons CC0 License';
        $wgWBRepoSettings['dataRightsUrl'] = 
'https://creativecommons.org/publicdomain/zero/1.0/';
 
-       $wgWBRepoSettings['siteLinkGroups'] = array(
-               'wikipedia',
-               'wikinews',
-               'wikiquote',
-               'wikisource',
-               'wikivoyage',
-               'special'
-       );
-
-       $wgWBRepoSettings['specialSiteLinkGroups'] = array( 'commons' );
-
        if ( $wgDBname === 'testwikidatawiki' ) {
-               $wgWBRepoSettings['specialSiteLinkGroups'][] = 'testwikidata';
-
                $wgWBRepoSettings['badgeItems'] = array(
                        'Q608' => 'wb-badge-goodarticle',
                        'Q609' => 'wb-badge-featuredarticle'
@@ -66,8 +74,6 @@
                // there is no cronjob dispatcher yet, this will do nothing
                $wgWBRepoSettings['clientDbList'] = array( 'test2wiki' );
        } else {
-               $wgWBRepoSettings['specialSiteLinkGroups'][] = 'wikidata';
-
                $wgWBRepoSettings['badgeItems'] = array(
                        'Q17437798' => 'wb-badge-goodarticle',
                        'Q17437796' => 'wb-badge-featuredarticle',
@@ -114,6 +120,8 @@
 
 if ( $wmgUseWikibaseClient ) {
 
+       $wgWBClientSettings = $wgWBSharedSettings + $wgWBClientSettings;
+
        // to be safe, keeping this here although $wgDBname is default setting
        $wgWBClientSettings['siteGlobalID'] = $wgDBname;
 
@@ -132,24 +140,7 @@
                'wikibase-property' => 'Property'
        );
 
-       // used by the sites module
-       $wgWBClientSettings['siteLinkGroups'] = array(
-               'wikipedia',
-               'wikinews',
-               'wikiquote',
-               'wikisource',
-               'wikivoyage',
-               'special'
-       );
-
-       $wgWBClientSettings['specialSiteLinkGroups'] = array( 'commons' );
        $wgWBClientSettings['languageLinkSiteGroup'] = $wmgWikibaseSiteGroup;
-
-       if ( $wgDBname === 'testwikidatawiki' ) {
-               $wgWBClientSettings['specialSiteLinkGroups'][] = 'testwikidata';
-       } elseif ( $wgDBname === 'wikidatawiki' ) {
-               $wgWBClientSettings['specialSiteLinkGroups'][] = 'wikidata';
-       }
 
        if ( $wgDBname === 'commonswiki' ) {
                $wgWBClientSettings['languageLinkSiteGroup'] = 'wikipedia';

-- 
To view, visit https://gerrit.wikimedia.org/r/181871
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3c96e3300176b1782857d4c63334df097cc022c9
Gerrit-PatchSet: 8
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Tpt <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: Daniel Kinzler <[email protected]>
Gerrit-Reviewer: Hoo man <[email protected]>
Gerrit-Reviewer: Lydia Pintscher <[email protected]>
Gerrit-Reviewer: Manybubbles <[email protected]>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: Tpt <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to