jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/347237 )
Change subject: Expose geoShapeStorageFrontendUrl through siteinfo
......................................................................
Expose geoShapeStorageFrontendUrl through siteinfo
Bug: T162561
Change-Id: Ib096bbcc405aeac6e83c2c08c1ea8c68f936655c
---
M repo/Wikibase.hooks.php
M repo/tests/phpunit/includes/RepoHooksTest.php
2 files changed, 7 insertions(+), 2 deletions(-)
Approvals:
Lokal Profil: Looks good to me, but someone else must approve
Jonas Kress (WMDE): Looks good to me, approved
jenkins-bot: Verified
Thiemo Mättig (WMDE): Looks good to me, but someone else must approve
diff --git a/repo/Wikibase.hooks.php b/repo/Wikibase.hooks.php
index 280325a..ff4fb34 100644
--- a/repo/Wikibase.hooks.php
+++ b/repo/Wikibase.hooks.php
@@ -850,8 +850,8 @@
}
/**
- * Adds a list of data value types, sparql endpoint and concept base
URI to
- * the action=query&meta=siteinfo API.
+ * Exposes configuration values to the action=query&meta=siteinfo API,
including lists of
+ * property and data value types, sparql endpoint, and several base
URLs and URIs.
*
* @param ApiQuerySiteinfo $api
* @param array &$data
@@ -870,6 +870,9 @@
$conceptBaseUri = $wikibaseRepo->getSettings()->getSetting(
'conceptBaseUri' );
$data['wikibase-conceptbaseuri'] = $conceptBaseUri;
+ $geoShapeStorageBaseUrl =
$wikibaseRepo->getSettings()->getSetting( 'geoShapeStorageFrontendUrl' );
+ $data['wikibase-geoshapestoragebaseurl'] =
$geoShapeStorageBaseUrl;
+
$sparqlEndpoint = $wikibaseRepo->getSettings()->getSetting(
'sparqlEndpoint' );
if ( is_string( $sparqlEndpoint ) ) {
$data['wikibase-sparql'] = $sparqlEndpoint;
diff --git a/repo/tests/phpunit/includes/RepoHooksTest.php
b/repo/tests/phpunit/includes/RepoHooksTest.php
index bcf3e54..fd0cbd7 100644
--- a/repo/tests/phpunit/includes/RepoHooksTest.php
+++ b/repo/tests/phpunit/includes/RepoHooksTest.php
@@ -67,6 +67,8 @@
$this->assertInternalType( 'string',
$actual['wikibase-conceptbaseuri'] );
+ $this->assertInternalType( 'string',
$actual['wikibase-geoshapestoragebaseurl'] );
+
if ( array_key_exists( 'wikibase-sparql', $actual ) ) {
$this->assertInternalType( 'string',
$actual['wikibase-sparql'] );
}
--
To view, visit https://gerrit.wikimedia.org/r/347237
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib096bbcc405aeac6e83c2c08c1ea8c68f936655c
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Lokal Profil <[email protected]>
Gerrit-Reviewer: Aleksey Bekh-Ivanov (WMDE) <[email protected]>
Gerrit-Reviewer: Jonas Kress (WMDE) <[email protected]>
Gerrit-Reviewer: Lokal Profil <[email protected]>
Gerrit-Reviewer: Lydia Pintscher (WMDE) <[email protected]>
Gerrit-Reviewer: Lydia Pintscher <[email protected]>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
