jenkins-bot has submitted this change and it was merged.

Change subject: Remove unreachable block
......................................................................


Remove unreachable block

 * After 82ed5e1d9cf127a34689f46491908c59892e3a72

Change-Id: I569e4ebeff2934b85608c4c37a5eaecfc99ddc89
---
M includes/Sanitizer.php
1 file changed, 1 insertion(+), 7 deletions(-)

Approvals:
  Subramanya Sastry: Looks good to me, but someone else must approve
  Cscott: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/Sanitizer.php b/includes/Sanitizer.php
index 387f24f..cd936f3 100644
--- a/includes/Sanitizer.php
+++ b/includes/Sanitizer.php
@@ -349,9 +349,6 @@
                                          \"([^<\"]*)\"
                                         | '([^<']*)'
                                         |  
([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 @@
         * @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] ) ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/229452
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I569e4ebeff2934b85608c4c37a5eaecfc99ddc89
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Arlolra <abrea...@wikimedia.org>
Gerrit-Reviewer: Cscott <canan...@wikimedia.org>
Gerrit-Reviewer: Jackmcbarn <jackmcb...@gmail.com>
Gerrit-Reviewer: Subramanya Sastry <ssas...@wikimedia.org>
Gerrit-Reviewer: Tim Starling <tstarl...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to