Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/196238
Change subject: Include WikibaseView directly in repo entry point
......................................................................
Include WikibaseView directly in repo entry point
the WikidataBuild avoids using the 'magic' composer
entry point, so does not load view automatically when
done that way.
This changes the loading to be the way WikibaseLib is
loaded. (not ideal, but works and more reliable)
When WikibaseView is completely split, then it would
be listed in composer.json and loaded that way instead.
Change-Id: I34db2a41597d35be3c9cfe56298c5648c8b7d4ce
---
M Wikibase.composer.php
M repo/Wikibase.php
2 files changed, 8 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/38/196238/1
diff --git a/Wikibase.composer.php b/Wikibase.composer.php
index 04461d5..ec45160 100644
--- a/Wikibase.composer.php
+++ b/Wikibase.composer.php
@@ -15,10 +15,3 @@
if ( !array_key_exists( 'wgEnableWikibaseClient', $GLOBALS ) ||
$GLOBALS['wgEnableWikibaseClient'] ) {
require_once __DIR__ . '/client/WikibaseClient.php';
}
-
-if (
- !array_key_exists( 'wgEnableWikibaseClient', $GLOBALS ) ||
$GLOBALS['wgEnableWikibaseClient'] ||
- !array_key_exists( 'wgEnableWikibaseRepo', $GLOBALS ) ||
$GLOBALS['wgEnableWikibaseRepo']
-) {
- require_once __DIR__ . '/view/WikibaseView.php';
-}
diff --git a/repo/Wikibase.php b/repo/Wikibase.php
index 0689f9f..0aeda2e 100644
--- a/repo/Wikibase.php
+++ b/repo/Wikibase.php
@@ -62,6 +62,14 @@
throw new Exception( 'Wikibase depends on the WikibaseLib extension.' );
}
+if ( !defined( 'WIKIBASE_VIEW_VERSION' ) ) {
+ include_once( __DIR__ . '/../view/WikibaseView.php' );
+}
+
+if ( !defined( 'WIKIBASE_VIEW_VERSION' ) ) {
+ throw new Exception( 'Wikibase depends on WikibaseView.' );
+}
+
call_user_func( function() {
global $wgExtensionCredits, $wgGroupPermissions,
$wgExtensionMessagesFiles, $wgMessagesDirs;
global $wgAPIModules, $wgSpecialPages, $wgHooks, $wgAvailableRights;
--
To view, visit https://gerrit.wikimedia.org/r/196238
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I34db2a41597d35be3c9cfe56298c5648c8b7d4ce
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude <aude.w...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
