jenkins-bot has submitted this change and it was merged.
Change subject: Added cross-tag sharing flag
......................................................................
Added cross-tag sharing flag
$wgKartographerWikivoyageMode enables sharing of Tag data
Change-Id: Ieec30a8cbcd920d708390bb9e02665af2bfa000e
---
M extension.json
M includes/Tag/TagHandler.php
2 files changed, 11 insertions(+), 0 deletions(-)
Approvals:
Esanders: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index 49663fd..661a6f9 100644
--- a/extension.json
+++ b/extension.json
@@ -200,7 +200,10 @@
"ParserTestFiles": [
"tests/parserTests.txt"
],
+
+ "@comment-config": "TODO: KartographerWikivoyageMode should be false by
default",
"config": {
+ "KartographerWikivoyageMode": true,
"KartographerDfltStyle": "osm-intl",
"KartographerStyles": ["osm-intl", "osm"],
"KartographerSrcsetScales": [1.3, 1.5, 2, 2.6, 3],
diff --git a/includes/Tag/TagHandler.php b/includes/Tag/TagHandler.php
index 2e75022..9fc8747 100644
--- a/includes/Tag/TagHandler.php
+++ b/includes/Tag/TagHandler.php
@@ -170,6 +170,14 @@
}
private function parseGroups() {
+ global $wgKartographerWikivoyageMode;
+
+ if ( !$wgKartographerWikivoyageMode ) {
+ // if we ignore all the 'group' and 'show' parameters,
+ // each tag stays private, and will be unable to share
data
+ return;
+ }
+
$this->groupName = $this->getText( 'group', null,
'/^[a-zA-Z0-9]+$/' );
$text = $this->getText( 'show', null,
'/^[a-zA-Z0-9]+(\s*,\s*[a-zA-Z0-9]+)*$/' );
--
To view, visit https://gerrit.wikimedia.org/r/275543
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ieec30a8cbcd920d708390bb9e02665af2bfa000e
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: master
Gerrit-Owner: Yurik <[email protected]>
Gerrit-Reviewer: Esanders <[email protected]>
Gerrit-Reviewer: MaxSem <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
