From: Ævar Arnfjörð Bjarmason <avar@users.mediawiki.org>
Date: Sun, 30 Oct 2005 11:25:50 +0000 (+0000)
Subject: * (bug 3808) added nntp:// to the url protocol whitelist
X-Git-Tag: 1.6.0~1264
X-Git-Url: http://git.cyclocoop.org/%22.%24h.%22?a=commitdiff_plain;h=40221c889cdd3a0b889a5d685ae054df4dcfff44;p=lhc%2Fweb%2Fwiklou.git

* (bug 3808) added nntp:// to the url protocol whitelist
* added worlwind:// to the url protocol whitelist
---

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index a59903637d..5a633a6337 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -148,9 +148,19 @@ $wgLegalTitleChars = " %!\"$&'()*,\\-.\\/0-9:;=?@A-Z\\\\^_`a-z~\\x80-\\xFF";
 
 
 /**
- * The external URL protocols (regexp)
- */
-$wgUrlProtocols = 'http:\/\/|https:\/\/|ftp:\/\/|irc:\/\/|gopher:\/\/|news:|mailto:';
+ * The external URL protocols
+ */
+$wgUrlProtocols = array(
+	'http://',
+	'https://',
+	'ftp://',
+	'irc://',
+	'gopher://',
+	'nntp://', // @bug 3808 RFC 1738
+	'worldwind://',
+	'mailto:',
+	'news:'
+);
 
 /** internal name of virus scanner. This servers as a key to the $wgAntivirusSetup array.
  * Set this to NULL to disable virus scanning. If not null, every file uploaded will be scanned for viruses.