Addshore has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/394215 )
Change subject: wdbuild: Remove wmgUseWikidataBuild
......................................................................
wdbuild: Remove wmgUseWikidataBuild
Change-Id: Ia3569683a9e04066b2262fed402cb02079b44452
---
M wmf-config/InitialiseSettings-labs.php
M wmf-config/InitialiseSettings.php
M wmf-config/Wikibase-buildentry.php
3 files changed, 12 insertions(+), 52 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/15/394215/1
diff --git a/wmf-config/InitialiseSettings-labs.php
b/wmf-config/InitialiseSettings-labs.php
index 11fd90e..e22b7dd 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -440,10 +440,6 @@
'default' => false, // T69651
],
- 'wmgUseWikidataBuild' => [
- 'default' => false,
- ],
-
'wmgUseArticlePlaceholder' => [
'default' => false,
'wikidataclient' => true,
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 23a2b19..68b40fe 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -17999,10 +17999,6 @@
'wikidata' => true,
],
-'wmgUseWikidataBuild' => [
- 'default' => false,
-],
-
'wmgUseWikibaseRepo' => [
'default' => false,
'wikidata' => true,
diff --git a/wmf-config/Wikibase-buildentry.php
b/wmf-config/Wikibase-buildentry.php
index 0a94880..001e285 100644
--- a/wmf-config/Wikibase-buildentry.php
+++ b/wmf-config/Wikibase-buildentry.php
@@ -7,50 +7,18 @@
$wgWikidataBuildBaseDir = $IP . '/extensions/Wikidata';
-if ( $wmgUseWikidataBuild ) {
+if ( !empty( $wmgUseWikibaseRepo ) ) {
+ include_once "$IP/extensions/Wikibase/repo/Wikibase.php";
+ include_once "$IP/extensions/Wikidata.org/WikidataOrg.php";
+ include_once "$IP/extensions/PropertySuggester/PropertySuggester.php";
+ include_once "$IP/extensions/Quality/WikibaseQuality.php";
+ include_once
"$IP/extensions/Constraints/WikibaseQualityConstraints.php";
+}
- if ( file_exists( $wgWikidataBuildBaseDir . '/vendor/autoload.php' ) ) {
- include_once $wgWikidataBuildBaseDir . '/vendor/autoload.php';
+if ( !empty( $wmgUseWikibaseClient ) ) {
+ include_once "$IP/extensions/Wikibase/client/WikibaseClient.php";
+ wfLoadExtension( 'WikimediaBadges' );
+ if ( !empty( $wmgUseArticlePlaceholder ) ) {
+ wfLoadExtension( 'ArticlePlaceholder' );
}
-
- if ( !empty( $wmgUseWikibaseRepo ) ) {
- include_once
"$wgWikidataBuildBaseDir/extensions/Wikibase/repo/Wikibase.php";
- include_once
"$wgWikidataBuildBaseDir/extensions/Wikidata.org/WikidataOrg.php";
- include_once
"$wgWikidataBuildBaseDir/extensions/PropertySuggester/PropertySuggester.php";
- include_once
"$wgWikidataBuildBaseDir/extensions/Quality/WikibaseQuality.php";
- include_once
"$wgWikidataBuildBaseDir/extensions/Constraints/WikibaseQualityConstraints.php";
- }
-
- if ( !empty( $wmgUseWikibaseClient ) ) {
- include_once
"$wgWikidataBuildBaseDir/extensions/Wikibase/client/WikibaseClient.php";
- wfLoadExtension( 'WikimediaBadges',
"$wgWikidataBuildBaseDir/extensions/WikimediaBadges/extension.json" );
- if ( !empty( $wmgUseArticlePlaceholder ) ) {
- wfLoadExtension( 'ArticlePlaceholder',
"$wgWikidataBuildBaseDir/extensions/ArticlePlaceholder/extension.json" );
- }
- }
-
- // This should be kept until the Wikidata build extension is actually
turned off
- // so that we can keep track of the version deployed on Special:Version
- require_once "$wgWikidataBuildBaseDir/Wikidata.credits.php";
-
-
-} else {
-
- if ( !empty( $wmgUseWikibaseRepo ) ) {
- include_once "$IP/extensions/Wikibase/repo/Wikibase.php";
- include_once "$IP/extensions/Wikidata.org/WikidataOrg.php";
- include_once
"$IP/extensions/PropertySuggester/PropertySuggester.php";
- include_once "$IP/extensions/Quality/WikibaseQuality.php";
- include_once
"$IP/extensions/Constraints/WikibaseQualityConstraints.php";
- }
-
- if ( !empty( $wmgUseWikibaseClient ) ) {
- include_once
"$IP/extensions/Wikibase/client/WikibaseClient.php";
- wfLoadExtension( 'WikimediaBadges' );
- if ( !empty( $wmgUseArticlePlaceholder ) ) {
- wfLoadExtension( 'ArticlePlaceholder' );
- }
- }
-
-
}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/394215
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia3569683a9e04066b2262fed402cb02079b44452
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Addshore <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
