jenkins-bot has submitted this change and it was merged. (
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(+), 50 deletions(-)
Approvals:
Addshore: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/InitialiseSettings-labs.php
b/wmf-config/InitialiseSettings-labs.php
index 243f463..00c2683 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -430,10 +430,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 9664855..cd59a11 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -18010,10 +18010,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 11f740b..573420c 100644
--- a/wmf-config/Wikibase-buildentry.php
+++ b/wmf-config/Wikibase-buildentry.php
@@ -5,48 +5,18 @@
* Various things have been changed (with the originals left commented)
*/
-$wgWikidataBuildBaseDir = $IP . '/extensions/Wikidata';
+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/WikibaseQuality/WikibaseQuality.php";
+ include_once
"$IP/extensions/WikibaseQualityConstraints/WikibaseQualityConstraints.php";
+}
-if ( $wmgUseWikidataBuild === false ) {
- 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/WikibaseQuality/WikibaseQuality.php";
- include_once
"$IP/extensions/WikibaseQualityConstraints/WikibaseQualityConstraints.php";
+if ( !empty( $wmgUseWikibaseClient ) ) {
+ include_once "$IP/extensions/Wikibase/client/WikibaseClient.php";
+ wfLoadExtension( 'WikimediaBadges' );
+ if ( !empty( $wmgUseArticlePlaceholder ) ) {
+ wfLoadExtension( 'ArticlePlaceholder' );
}
-
- if ( !empty( $wmgUseWikibaseClient ) ) {
- include_once
"$IP/extensions/Wikibase/client/WikibaseClient.php";
- wfLoadExtension( 'WikimediaBadges' );
- if ( !empty( $wmgUseArticlePlaceholder ) ) {
- wfLoadExtension( 'ArticlePlaceholder' );
- }
- }
-
-} else {
- if ( file_exists( $wgWikidataBuildBaseDir . '/vendor/autoload.php' ) ) {
- include_once $wgWikidataBuildBaseDir . '/vendor/autoload.php';
- }
-
- 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";
-
}
--
To view, visit https://gerrit.wikimedia.org/r/394215
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia3569683a9e04066b2262fed402cb02079b44452
Gerrit-PatchSet: 9
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Aude <aude.w...@gmail.com>
Gerrit-Reviewer: Hoo man <h...@online.de>
Gerrit-Reviewer: Urbanecm <martin.urba...@wikimedia.cz>
Gerrit-Reviewer: Zoranzoki21 <zorandori4...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
