jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/394216 )
Change subject: wdbuild: Remove Wikibase-buildentry.php config file (empty) ...................................................................... wdbuild: Remove Wikibase-buildentry.php config file (empty) Change-Id: I0af71546ad4bd1d74dabbfc3a0832ac7f779d273 --- D wmf-config/Wikibase-buildentry.php M wmf-config/Wikibase.php 2 files changed, 17 insertions(+), 25 deletions(-) Approvals: Addshore: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/Wikibase-buildentry.php b/wmf-config/Wikibase-buildentry.php deleted file mode 100644 index 573420c..0000000 --- a/wmf-config/Wikibase-buildentry.php +++ /dev/null @@ -1,22 +0,0 @@ -<?php -/** - * This file is a copy of https://github.com/wikimedia/mediawiki-extensions-Wikidata/blob/master/Wikidata.php - * This file has been created as part of https://phabricator.wikimedia.org/T176948 (Killing the Wikidata build) - * Various things have been changed (with the originals left commented) - */ - -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' ); - } -} diff --git a/wmf-config/Wikibase.php b/wmf-config/Wikibase.php index dba9874..2ea0822 100644 --- a/wmf-config/Wikibase.php +++ b/wmf-config/Wikibase.php @@ -1,8 +1,22 @@ <?php -// Load old build config T176948 -// TODO move that config into this file at some point... -require_once "{$wmfConfigDir}/Wikibase-buildentry.php"; +// Load the Repo extensions +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"; +} + +// Load the Client extensions +if ( !empty( $wmgUseWikibaseClient ) ) { + include_once "$IP/extensions/Wikibase/client/WikibaseClient.php"; + wfLoadExtension( 'WikimediaBadges' ); + if ( !empty( $wmgUseArticlePlaceholder ) ) { + wfLoadExtension( 'ArticlePlaceholder' ); + } +} // This allows cache invalidations to be in sync with deploys // and not shared across different versions of wikibase. -- To view, visit https://gerrit.wikimedia.org/r/394216 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0af71546ad4bd1d74dabbfc3a0832ac7f779d273 Gerrit-PatchSet: 8 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Addshore <[email protected]> Gerrit-Reviewer: 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
