Merge "Allow stop characters as quoted attribute delimiters"

diff --combined includes/Sanitizer.php
index c02bdc9,3591504..8179905
--- 1/includes/Sanitizer.php
--- 2/includes/Sanitizer.php
+++ b/includes/Sanitizer.php
@@@ -346,8 -346,8 +346,8 @@@ class Sanitizer 
                                  ($space*=$space*
                                        (?:
                                         # The attribute value: quoted or alone
-                                         \"([^<\"]*)\"
-                                        | '([^<']*)'
+                                         \"([^<\"]*)(?:\"|\$)
+                                        | '([^<']*)(?:'|\$)
                                         |  ([a-zA-Z0-9!#$%&()*,\\-.\\/:;<>?@[\\]^_`{|}~]+)
                                        )
                                )?(?=$space|\$)/sx";
@@@ -1809,7 -1809,7 +1809,7 @@@
                        $host = preg_replace( $strip, '', $host );
  
                        // IPv6 host names are bracketed with [].  Url-decode these.
 -                      if ( substr_compare( "//%5B", $host, 0, 5 ) === 0 && preg_match( '!^//%5B(.*?)%5D((:\d+)?)$!', $host, $matches ) ) {
 +                      if ( substr_compare( "//%5B", $host, 0, 5 ) === 0 && preg_match( '!^//%5B([0-9A-Fa-f:.]+)%5D((:\d+)?)$!', $host, $matches ) ) {
                                $host = '//[' . $matches[1] . ']' . $matches[2];
                        }