(bug 29497) To support protocol-relative URLs in external links, add '//' to $wgUrlPr...

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index e5b05f9..e6b02f8 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -2790,6 +2790,7 @@ $wgUrlProtocols = array(
        'svn://',
        'git://',
        'mms://',
+       '//', // for protocol-relative URLs
 );
 
 /**

diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 39637bf..6227ac3 100644 (file)
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -183,7 +183,7 @@ class Parser {
        public function __construct( $conf = array() ) {
                $this->mConf = $conf;
                $this->mUrlProtocols = wfUrlProtocols();
-               $this->mExtLinkBracketedRegex = '/\[(\b(' . wfUrlProtocols() . ')'.
+               $this->mExtLinkBracketedRegex = '/\[((' . wfUrlProtocols() . ')'.
                        '[^][<>"\\x00-\\x20\\x7F]+) *([^\]\\x00-\\x08\\x0a-\\x1F]*?)\]/S';
                if ( isset( $conf['preprocessorClass'] ) ) {
                        $this->mPreprocessorClass = $conf['preprocessorClass'];