jenkins-bot has submitted this change and it was merged.
Change subject: Move urlSchemes setting to repo
......................................................................
Move urlSchemes setting to repo
Since the validators got moved into repo/ this setting
is only used there as well.
Change-Id: Ia5a88212d12b98c0f4755683c0a30c92c2fe5f06
---
M docs/options.wiki
M lib/config/WikibaseLib.default.php
M repo/config/Wikibase.default.php
3 files changed, 7 insertions(+), 8 deletions(-)
Approvals:
Jeroen De Dauw: Looks good to me, approved
jenkins-bot: Verified
diff --git a/docs/options.wiki b/docs/options.wiki
index 5da347a..0b2b541 100644
--- a/docs/options.wiki
+++ b/docs/options.wiki
@@ -19,8 +19,6 @@
:* NOTE: The default may change in order to use the repo's database name
automatically.
;sharedCacheDuration: The default duration of entries in the shared object
cache, in seconds. Default is 3600 seconds = 1 hour.
;sharedCacheType: The type of cache to use for the shared object cache.
Defaults to $wgMainCacheType. Use CACHE_XXX constants.
-;urlSchemes: Which URL schemes should be allowed in URL data values. The
default is array( 'http', 'https' ). Other supported schemes are 'ftp' and
'mailto'. Schemes (protocols) added here will only have any effect if
validation is supported for that protocol; that is, adding 'mailto' will work,
while adding 'gopher' will do nothing.
-:* NOTE: This setting is only really meaningful for the repository, it's
shared with the client extension for technical reasons.
;entityPrefixes: ID prefixes to use for the different entity types, as an
associative array mapping prefixes to entity type constants. Default:
<poem>
array(
@@ -56,6 +54,7 @@
;multilang-limits: Limits to impose on multilanguage strings like labels,
descriptions and such. Supported limits:
:;length: the maximum length of the string, in characters.
:Default: <code>array( 'length' => 250 )</code>
+;urlSchemes: Which URL schemes should be allowed in URL data values. The
default is array( 'http', 'https' ). Other supported schemes are 'ftp' and
'mailto'. Schemes (protocols) added here will only have any effect if
validation is supported for that protocol; that is, adding 'mailto' will work,
while adding 'gopher' will do nothing.
;useRedirectTargetColumn: Whether to use the epp_redirect_target column in the
wb_entity_per_page table for detecting redirects. True per default, can be set
to false in an environment where the necessary database update can't be
deployed right away. To set up the table manually, run
repo/sql/AddEppRedirectTarget.sql to create it, then use
repo/maintenance/rebuildEntityPerPage.php to rebuild the table if neccessary.
;formatterUrlProperty: Property to be used on properties that defines a
formatter URL which is used to link identifiers. The placeholder
<code>$1</code> will be replaced by the identifier. Example:
<code>https://www.wikidata.org/entity/$1</code>
;transformLegacyFormatOnExport: Whether entity revisions stored in a legacy
format should be converted on the fly while exporting. Enabled per default.
diff --git a/lib/config/WikibaseLib.default.php
b/lib/config/WikibaseLib.default.php
index 80b4af5..47ec7ca 100644
--- a/lib/config/WikibaseLib.default.php
+++ b/lib/config/WikibaseLib.default.php
@@ -70,10 +70,7 @@
'url',
'wikibase-item',
'wikibase-property',
- ),
-
- // URL schemes allowed for URL values. See UrlSchemeValidators for a
full list.
- 'urlSchemes' => array( 'ftp', 'http', 'https', 'irc', 'mailto' )
+ )
);
// experimental stuff
diff --git a/repo/config/Wikibase.default.php b/repo/config/Wikibase.default.php
index 5af6918..b16faab 100644
--- a/repo/config/Wikibase.default.php
+++ b/repo/config/Wikibase.default.php
@@ -32,6 +32,9 @@
'length' => 250, // length constraint
),
+ // URL schemes allowed for URL values. See UrlSchemeValidators
for a full list.
+ 'urlSchemes' => array( 'ftp', 'http', 'https', 'irc', 'mailto'
),
+
// Items allowed to be used as badges pointing to their CSS
class names
'badgeItems' => array(),
@@ -40,8 +43,8 @@
'dataSquidMaxage' => $wgSquidMaxage,
// Settings for change dispatching
- 'dispatchBatchChunkFactor' => 3,
- 'dispatchBatchCacheFactor' => 3,
+ 'dispatchBatchChunkFactor' => 3,
+ 'dispatchBatchCacheFactor' => 3,
// Formats that shall be available via SpecialEntityData.
// The first format will be used as the default.
--
To view, visit https://gerrit.wikimedia.org/r/237665
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia5a88212d12b98c0f4755683c0a30c92c2fe5f06
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Bene <benestar.wikime...@gmail.com>
Gerrit-Reviewer: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Jeroen De Dauw <jeroended...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
