Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/119748
Change subject: Remove legacy settings for wikibase setup without the build
......................................................................
Remove legacy settings for wikibase setup without the build
Change-Id: I502c530cc695c03718a484afa0c549a16c337da2
---
M wmf-config/CommonSettings.php
M wmf-config/Wikibase.php
2 files changed, 8 insertions(+), 30 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/48/119748/1
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 39856fd..6c95d2c 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2473,14 +2473,10 @@
}
}
-$wmgUseWikibaseBuild = !in_array( $wmfVersionNumber, array( '1.23wmf10',
'1.23wmf11' ) );
-
// @note getRealmSpecificFilename only works with filenames with .suffix
-if ( $wmgUseWikibaseBuild ) {
- $wgExtensionEntryPointListFiles[] =
"$IP/extensions/Wikidata/extension-list-wikidata";
-} else {
- $wgExtensionEntryPointListFiles[] =
"$wmfConfigDir/extension-list-wikidata";
-}
+// needs to be listed outside of use wikibase check below, as localisation
cache
+// might be build as "aawikibooks" or something that does not have Wikibase.
+$wgExtensionEntryPointListFiles[] =
"$IP/extensions/Wikidata/extension-list-wikidata";
if ( $wmgUseWikibaseRepo || $wmgUseWikibaseClient ) {
include( "$wmfConfigDir/Wikibase.php" );
diff --git a/wmf-config/Wikibase.php b/wmf-config/Wikibase.php
index 8772196..395e0ad 100644
--- a/wmf-config/Wikibase.php
+++ b/wmf-config/Wikibase.php
@@ -1,26 +1,12 @@
<?php
-if ( !$wmgUseWikibaseBuild ) {
- require_once( "$IP/extensions/DataValues/DataValues.php" );
- 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" );
-} else {
- require_once( "$IP/extensions/Wikidata/Wikidata.php" );
-}
+require_once( "$IP/extensions/Wikidata/Wikidata.php" );
if ( $wmgUseWikibaseRepo ) {
- if ( !$wmgUseWikibaseBuild ) {
- require_once( "$IP/extensions/Wikibase/repo/Wikibase.php" );
- }
-
- if ( $wmgUseWikibaseBuild ) {
- // bump for wikidatawiki and test wikidata
- // @todo: can move to InitialiseSettings later, but having here
- // Issues with changes in Wikidata 1.23wmf15
- $wgCacheEpoch = '20140225200000';
- }
+ // bump for wikidatawiki and test wikidata
+ // @todo: can move to InitialiseSettings later, but having here
+ // Issues with changes in Wikidata 1.23wmf15
+ $wgCacheEpoch = '20140225200000';
$baseNs = 120;
@@ -82,10 +68,6 @@
}
if ( $wmgUseWikibaseClient ) {
-
- if ( !$wmgUseWikibaseBuild ) {
- require_once(
"$IP/extensions/Wikibase/client/WikibaseClient.php" );
- }
// to be safe, keeping this here although $wgDBname is default setting
$wgWBClientSettings['siteGlobalID'] = $wgDBname;
--
To view, visit https://gerrit.wikimedia.org/r/119748
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I502c530cc695c03718a484afa0c549a16c337da2
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Aude <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
