Jeroen De Dauw has submitted this change and it was merged.
Change subject: load ValueView when Wikibase is installed via composer
......................................................................
load ValueView when Wikibase is installed via composer
Change-Id: Ic2bf7b0159091cb7c2c73406264f734adb1dcf75
---
M lib/WikibaseLib.php
1 file changed, 6 insertions(+), 1 deletion(-)
Approvals:
Jeroen De Dauw: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/WikibaseLib.php b/lib/WikibaseLib.php
index eaa7e7a..9e819b1 100644
--- a/lib/WikibaseLib.php
+++ b/lib/WikibaseLib.php
@@ -79,7 +79,12 @@
@include_once( __DIR__ . '/../../DataValues/ValueView/ValueView.php' );
}
-// Include the ValueView library if that hasn't been done yet.
+// Include the ValueView library if Wikibase dependencies are installed via
composer.
+if ( !defined( 'VALUEVIEW_VERSION' ) ) {
+ @include_once( __DIR__ .
'/../vendor/data-values/data-values/ValueView/ValueView.php' );
+}
+
+// Include the ValueView library if that hasn't been done yet. (e.g. using
Wikibase build)
if ( !defined( 'VALUEVIEW_VERSION' ) ) {
@include_once( __DIR__ .
'/../../../data-values/data-values/ValueView/ValueView.php' );
}
--
To view, visit https://gerrit.wikimedia.org/r/88746
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic2bf7b0159091cb7c2c73406264f734adb1dcf75
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: Daniel Kinzler <[email protected]>
Gerrit-Reviewer: Jeroen De Dauw <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
