From: Arlo Breault <abreault@wikimedia.org>
Date: Wed, 5 Aug 2015 18:26:51 +0000 (-0700)
Subject: Remove unreachable block
X-Git-Tag: 1.31.0-rc.0~10333^2
X-Git-Url: http://git.cyclocoop.org/wiki/Target_page?a=commitdiff_plain;h=e69c4c495efca54aa70e2d2368bd9fbcb38ab81e;p=lhc%2Fweb%2Fwiklou.git

Remove unreachable block

 * After 82ed5e1d9cf127a34689f46491908c59892e3a72

Change-Id: I569e4ebeff2934b85608c4c37a5eaecfc99ddc89
---

diff --git a/includes/Sanitizer.php b/includes/Sanitizer.php
index 387f24faa0..cd936f3f0a 100644
--- a/includes/Sanitizer.php
+++ b/includes/Sanitizer.php
@@ -349,9 +349,6 @@ class Sanitizer {
 					  \"([^<\"]*)\"
 					 | '([^<']*)'
 					 |  ([a-zA-Z0-9!#$%&()*,\\-.\\/:;<>?@[\\]^_`{|}~]+)
-					 |  (\#[0-9a-fA-F]+) # Technically wrong, but lots of
-										 # colors are specified like this.
-										 # We'll be normalizing it.
 					)
 				)?(?=$space|\$)/sx";
 		}
@@ -1263,10 +1260,7 @@ class Sanitizer {
 	 * @return string
 	 */
 	private static function getTagAttributeCallback( $set ) {
-		if ( isset( $set[6] ) ) {
-			# Illegal #XXXXXX color with no quotes.
-			return $set[6];
-		} elseif ( isset( $set[5] ) ) {
+		if ( isset( $set[5] ) ) {
 			# No quotes.
 			return $set[5];
 		} elseif ( isset( $set[4] ) ) {