jenkins-bot has submitted this change and it was merged.
Change subject: Add DataTypes extension
......................................................................
Add DataTypes extension
- this allows things to work whether we are on a deployment branch,
which has DataTypes within DataValues or in master / future deployment
branch which will have DataTypes all in the new extension.
- tested with merge message list and it does the right thing in both
cases.
Change-Id: I74f68d20d9e98f73e2dfda56d4ae21c59853713f
---
M wmf-config/CommonSettings.php
M wmf-config/extension-list
2 files changed, 12 insertions(+), 0 deletions(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 82332d3..5b0d8d9 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2483,6 +2483,17 @@
if ( $wmgUseWikibaseRepo || $wmgUseWikibaseClient ) {
require_once( "$IP/extensions/DataValues/DataValues.php" );
+
+ // DataTypes is being moved out of the DataValues git repo.
+ // this allows DataTypes in DataValues to be used if it exists, such as
older code.
+ // if it is not found in DataValues, then load it below.
+ //
+ // For localisation update, there is an empty "dummy" branch of
DataTypes
+ // so that localisation update can run okay.
+ if ( !defined( 'DataTypes_VERSION' ) ) {
+ require_once( "$IP/extensions/DataTypes/DataTypes.php" );
+ }
+
require_once( "$IP/extensions/Diff/Diff.php" );
require_once( "$IP/extensions/WikibaseDataModel/WikibaseDataModel.php"
);
require_once( "$IP/extensions/Wikibase/lib/WikibaseLib.php" );
diff --git a/wmf-config/extension-list b/wmf-config/extension-list
index fc925a0..3f23063 100644
--- a/wmf-config/extension-list
+++ b/wmf-config/extension-list
@@ -39,6 +39,7 @@
$IP/extensions/DataValues/ValueFormatters/ValueFormatters.i18n.php
$IP/extensions/DataValues/ValueParsers/ValueParsers.i18n.php
$IP/extensions/DataValues/ValueValidators/ValueValidators.i18n.php
+$IP/extensions/DataTypes/DataTypes.i18n.php
$IP/extensions/Diff/Diff.php
$IP/extensions/DisableAccount/DisableAccount.php
$IP/extensions/Disambiguator/Disambiguator.php
--
To view, visit https://gerrit.wikimedia.org/r/76481
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I74f68d20d9e98f73e2dfda56d4ae21c59853713f
Gerrit-PatchSet: 5
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Aude <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Greg Grossmeier <[email protected]>
Gerrit-Reviewer: Jeroen De Dauw <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
