Addshore has submitted this change and it was merged.
Change subject: remove enforcement of Wikibase client / repo load order
......................................................................
remove enforcement of Wikibase client / repo load order
it's interfering with localisation cache rebuild for beta labs,
which uses master.
see also I9d22e46d which handles the extension settings in a new way
that is more leniant about load order.
Change-Id: I7a2e9a23e45b4c47301d629e1e6075b5863bade9
---
M repo/Wikibase.php
1 file changed, 0 insertions(+), 9 deletions(-)
Approvals:
Addshore: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/Wikibase.php b/repo/Wikibase.php
index 4f86b09..f6a1d00 100644
--- a/repo/Wikibase.php
+++ b/repo/Wikibase.php
@@ -46,15 +46,6 @@
die( "<b>Error:</b> Wikibase requires MediaWiki 1.20 or above.\n" );
}
-if ( defined( 'WBC_VERSION' ) ) {
- // TODO: needed because WikibaseClient.defaults.php depends on
WB_VERSION to know whether the
- // repo is configured. Should be removed as soon as we change Settings
to apply defaults
- // "late", that is, when merging settings, after setup is complete.
-
- throw new Exception( "Bad initialization order: When running the
Wikibase repository extension and the "
- . "WikibaseClient extension on the same wiki, WikibaseClient
has to be included AFTER the repository." );
-}
-
// Include the WikibaseLib extension if that hasn't been done yet, since it's
required for Wikibase to work.
if ( !defined( 'WBL_VERSION' ) ) {
@include_once( __DIR__ . '/../lib/WikibaseLib.php' );
--
To view, visit https://gerrit.wikimedia.org/r/76478
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7a2e9a23e45b4c47301d629e1e6075b5863bade9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Jeroen De Dauw <[email protected]>
Gerrit-Reviewer: Tobias Gritschacher <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
