Hello Aude, Urbanecm, Hoo man, jenkins-bot, Zoranzoki21,
I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/394399
to review the following change.
Change subject: Revert "wdbuild: add switch to ease killing"
......................................................................
Revert "wdbuild: add switch to ease killing"
Already reverted on tin
This reverts commit 013d763302b2542eeb89696ab410d157f322b57b.
Change-Id: I598f14330eebf9df323d52414118fd10e5252cac
---
M wmf-config/InitialiseSettings-labs.php
M wmf-config/InitialiseSettings.php
M wmf-config/Wikibase-buildentry.php
3 files changed, 22 insertions(+), 51 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/99/394399/1
diff --git a/wmf-config/InitialiseSettings-labs.php
b/wmf-config/InitialiseSettings-labs.php
index a139a41..00c2683 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -430,10 +430,6 @@
'default' => false, // T69651
],
- 'wmgUseWikidataBuild' => [
- 'default' => true,
- ],
-
'wmgUseArticlePlaceholder' => [
'default' => false,
'wikidataclient' => true,
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index abccb86..cd59a11 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -18010,10 +18010,6 @@
'wikidata' => true,
],
-'wmgUseWikidataBuild' => [
- 'default' => true,
-],
-
'wmgUseWikibaseRepo' => [
'default' => false,
'wikidata' => true,
diff --git a/wmf-config/Wikibase-buildentry.php
b/wmf-config/Wikibase-buildentry.php
index dfadbec..98c759e 100644
--- a/wmf-config/Wikibase-buildentry.php
+++ b/wmf-config/Wikibase-buildentry.php
@@ -7,47 +7,26 @@
$wgWikidataBuildBaseDir = $IP . '/extensions/Wikidata';
-if ( $wmgUseWikidataBuild ) {
- 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";
-
-} 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' );
- }
- }
-
+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/394399
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I598f14330eebf9df323d52414118fd10e5252cac
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Addshore <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: Hoo man <[email protected]>
Gerrit-Reviewer: Urbanecm <[email protected]>
Gerrit-Reviewer: Zoranzoki21 <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
