From 0392e9babfc5695b21f55eeedf1b5d54ba25434a Mon Sep 17 00:00:00 2001
From: Ryan Cramer <ryan@processwire.com>
Date: Thu, 15 Aug 2019 06:20:38 -0400
Subject: [PATCH] Update htmlpurifier version to 4.11.0

---
 wire/core/Functions.php                       |    1 +
 .../MarkupHTMLPurifier.module                 |    9 +-
 .../htmlpurifier/HTMLPurifier.standalone.php  | 1059 +++++++++--------
 .../HTMLPurifier/ConfigSchema/schema.ser      |  Bin 15923 -> 24124 bytes
 .../AutoFormat.RemoveEmpty.RemoveNbsp.txt     |    2 +-
 .../schema/Core.AllowParseManyTags.txt        |   12 +
 .../schema/Core.ColorKeywords.txt             |  159 ++-
 .../Language/messages/en-x-test.php           |    2 +
 .../Language/messages/en-x-testmini.php       |    2 +
 .../standalone/HTMLPurifier/Lexer/PH5P.php    |    4 +-
 .../HTMLPurifier/Printer/ConfigForm.min.js    |    1 -
 .../HTMLPurifier/Printer/ConfigForm.php       |    4 +-
 12 files changed, 748 insertions(+), 507 deletions(-)
 create mode 100644 wire/modules/Markup/MarkupHTMLPurifier/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.AllowParseManyTags.txt
 delete mode 100644 wire/modules/Markup/MarkupHTMLPurifier/htmlpurifier/standalone/HTMLPurifier/Printer/ConfigForm.min.js

diff --git a/wire/core/Functions.php b/wire/core/Functions.php
index 05cb1aa5..21fe9429 100644
--- a/wire/core/Functions.php
+++ b/wire/core/Functions.php
@@ -81,6 +81,7 @@ if(!function_exists("tabIndent")):
 	 * @param string $str String that needs the tabs
 	 * @param int $numTabs Number of tabs to insert per line (note any existing tabs are left as-is, so indentation is retained)
 	 * @param string $str The provided string but with tabs inserted
+	 * @return string
 	 * @deprecated
 	 *
 	 */
diff --git a/wire/modules/Markup/MarkupHTMLPurifier/MarkupHTMLPurifier.module b/wire/modules/Markup/MarkupHTMLPurifier/MarkupHTMLPurifier.module
index 9b642b3a..fb1a0191 100644
--- a/wire/modules/Markup/MarkupHTMLPurifier/MarkupHTMLPurifier.module
+++ b/wire/modules/Markup/MarkupHTMLPurifier/MarkupHTMLPurifier.module
@@ -31,7 +31,7 @@ class MarkupHTMLPurifier extends WireData implements Module {
 		return array(
 			'title' => 'HTML Purifier', 
 			'summary' => 'Front-end to the HTML Purifier library.', 
-			'version' => 492, 
+			'version' => 495, 
 			'singular' => false, 
 			'autoload' => false, 
 			);
@@ -114,16 +114,9 @@ class MarkupHTMLPurifier extends WireData implements Module {
 	 */
 	public function purify($html) {
 		
-		// prepare markup for things that HTMLPurifier doesn't support
-		$hasTel = strpos($html, 'href="tel:') !== false;
-		if($hasTel) $html = str_replace('href="tel:', 'href="tel//:', $html);
-	
 		// purify
 		$html = $this->getPurifier()->purify($html);
 	
-		// finish markup for things that HTMLPurifier doesn't support
-		if($hasTel) $html = str_replace('href="tel//:', 'href="tel:', $html);
-		
 		return $html;
 	}
 
diff --git a/wire/modules/Markup/MarkupHTMLPurifier/htmlpurifier/HTMLPurifier.standalone.php b/wire/modules/Markup/MarkupHTMLPurifier/htmlpurifier/HTMLPurifier.standalone.php
index a4483471..23094267 100644
--- a/wire/modules/Markup/MarkupHTMLPurifier/htmlpurifier/HTMLPurifier.standalone.php
+++ b/wire/modules/Markup/MarkupHTMLPurifier/htmlpurifier/HTMLPurifier.standalone.php
@@ -7,7 +7,7 @@
  * primary concern and you are using an opcode cache. PLEASE DO NOT EDIT THIS
  * FILE, changes will be overwritten the next time the script is run.
  *
- * @version 4.9.3
+ * @version 4.11.0
  *
  * @warning
  *      You must *not* include any other HTML Purifier files before this file,
@@ -39,7 +39,7 @@
  */
 
 /*
-    HTML Purifier 4.9.3 - Standards Compliant HTML Filtering
+    HTML Purifier 4.11.0 - Standards Compliant HTML Filtering
     Copyright (C) 2006-2008 Edward Z. Yang
 
     This library is free software; you can redistribute it and/or
@@ -78,12 +78,12 @@ class HTMLPurifier
      * Version of HTML Purifier.
      * @type string
      */
-    public $version = '4.9.3';
+    public $version = '4.11.0';
 
     /**
      * Constant with version of HTML Purifier.
      */
-    const VERSION = '4.9.3';
+    const VERSION = '4.11.0';
 
     /**
      * Global configuration object.
@@ -260,12 +260,16 @@ class HTMLPurifier
     public function purifyArray($array_of_html, $config = null)
     {
         $context_array = array();
-        foreach ($array_of_html as $key => $html) {
-            $array_of_html[$key] = $this->purify($html, $config);
+        foreach($array_of_html as $key=>$value){
+            if (is_array($value)) {
+                $array[$key] = $this->purifyArray($value, $config);
+            } else {
+                $array[$key] = $this->purify($value, $config);
+            }
             $context_array[$key] = $this->context;
         }
         $this->context = $context_array;
-        return $array_of_html;
+        return $array;
     }
 
     /**
@@ -309,8 +313,8 @@ class HTMLPurifier
     }
 }
 
-
-
+
+
 
 
 /**
@@ -382,7 +386,7 @@ class HTMLPurifier_Arborize
         return $tokens;
     }
 }
-
+
 
 
 /**
@@ -530,8 +534,8 @@ class HTMLPurifier_AttrCollections
     }
 }
 
-
-
+
+
 
 
 /**
@@ -675,8 +679,8 @@ abstract class HTMLPurifier_AttrDef
     }
 }
 
-
-
+
+
 
 
 /**
@@ -736,8 +740,8 @@ abstract class HTMLPurifier_AttrTransform
     }
 }
 
-
-
+
+
 
 
 /**
@@ -833,8 +837,8 @@ class HTMLPurifier_AttrTypes
     }
 }
 
-
-
+
+
 
 
 /**
@@ -1012,8 +1016,8 @@ class HTMLPurifier_AttrValidator
 
 }
 
-
-
+
+
 
 
 // constants are slow, so we use as few as possible
@@ -1138,8 +1142,8 @@ class HTMLPurifier_Bootstrap
     }
 }
 
-
-
+
+
 
 
 /**
@@ -1194,8 +1198,8 @@ abstract class HTMLPurifier_Definition
     }
 }
 
-
-
+
+
 
 
 /**
@@ -1418,15 +1422,25 @@ class HTMLPurifier_CSSDefinition extends HTMLPurifier_Definition
             array(
                 new HTMLPurifier_AttrDef_CSS_Length('0'),
                 new HTMLPurifier_AttrDef_CSS_Percentage(true),
-                new HTMLPurifier_AttrDef_Enum(array('auto'))
+                new HTMLPurifier_AttrDef_Enum(array('auto', 'initial', 'inherit'))
+            )
+        );
+        $trusted_min_wh = new HTMLPurifier_AttrDef_CSS_Composite(
+            array(
+                new HTMLPurifier_AttrDef_CSS_Length('0'),
+                new HTMLPurifier_AttrDef_CSS_Percentage(true),
+                new HTMLPurifier_AttrDef_Enum(array('initial', 'inherit'))
+            )
+        );
+        $trusted_max_wh = new HTMLPurifier_AttrDef_CSS_Composite(
+            array(
+                new HTMLPurifier_AttrDef_CSS_Length('0'),
+                new HTMLPurifier_AttrDef_CSS_Percentage(true),
+                new HTMLPurifier_AttrDef_Enum(array('none', 'initial', 'inherit'))
             )
         );
         $max = $config->get('CSS.MaxImgLength');
 
-        $this->info['min-width'] =
-        $this->info['max-width'] =
-        $this->info['min-height'] =
-        $this->info['max-height'] =
         $this->info['width'] =
         $this->info['height'] =
             $max === null ?
@@ -1443,6 +1457,38 @@ class HTMLPurifier_CSSDefinition extends HTMLPurifier_Definition
                     // For everyone else:
                     $trusted_wh
                 );
+        $this->info['min-width'] =
+        $this->info['min-height'] =
+            $max === null ?
+                $trusted_min_wh :
+                new HTMLPurifier_AttrDef_Switch(
+                    'img',
+                    // For img tags:
+                    new HTMLPurifier_AttrDef_CSS_Composite(
+                        array(
+                            new HTMLPurifier_AttrDef_CSS_Length('0', $max),
+                            new HTMLPurifier_AttrDef_Enum(array('initial', 'inherit'))
+                        )
+                    ),
+                    // For everyone else:
+                    $trusted_min_wh
+                );
+        $this->info['max-width'] =
+        $this->info['max-height'] =
+            $max === null ?
+                $trusted_max_wh :
+                new HTMLPurifier_AttrDef_Switch(
+                    'img',
+                    // For img tags:
+                    new HTMLPurifier_AttrDef_CSS_Composite(
+                        array(
+                            new HTMLPurifier_AttrDef_CSS_Length('0', $max),
+                            new HTMLPurifier_AttrDef_Enum(array('none', 'initial', 'inherit'))
+                        )
+                    ),
+                    // For everyone else:
+                    $trusted_max_wh
+                );
 
         $this->info['text-decoration'] = new HTMLPurifier_AttrDef_CSS_TextDecoration();
 
@@ -1686,8 +1732,8 @@ class HTMLPurifier_CSSDefinition extends HTMLPurifier_Definition
     }
 }
 
-
-
+
+
 
 
 /**
@@ -1739,8 +1785,8 @@ abstract class HTMLPurifier_ChildDef
     abstract public function validateChildren($children, $config, $context);
 }
 
-
-
+
+
 
 
 /**
@@ -1764,7 +1810,7 @@ class HTMLPurifier_Config
      * HTML Purifier's version
      * @type string
      */
-    public $version = '4.9.3';
+    public $version = '4.11.0';
 
     /**
      * Whether or not to automatically finalize
@@ -2633,7 +2679,7 @@ class HTMLPurifier_Config
             // zip(tail(trace), trace) -- but PHP is not Haskell har har
             for ($i = 0, $c = count($trace); $i < $c - 1; $i++) {
                 // XXX this is not correct on some versions of HTML Purifier
-                if ($trace[$i + 1]['class'] === 'HTMLPurifier_Config') {
+                if (isset($trace[$i + 1]['class']) && $trace[$i + 1]['class'] === 'HTMLPurifier_Config') {
                     continue;
                 }
                 $frame = $trace[$i];
@@ -2660,8 +2706,8 @@ class HTMLPurifier_Config
 
 }
 
-
-
+
+
 
 
 /**
@@ -2764,7 +2810,7 @@ class HTMLPurifier_ConfigSchema
      * @param string $key Name of directive
      * @param mixed $default Default value of directive
      * @param string $type Allowed type of the directive. See
-     *      HTMLPurifier_DirectiveDef::$type for allowed values
+     *      HTMLPurifier_VarParser::$types for allowed values
      * @param bool $allow_null Whether or not to allow null values
      */
     public function add($key, $default, $type, $allow_null)
@@ -2837,8 +2883,8 @@ class HTMLPurifier_ConfigSchema
     }
 }
 
-
-
+
+
 
 
 /**
@@ -3008,8 +3054,8 @@ class HTMLPurifier_ContentSets
     }
 }
 
-
-
+
+
 
 
 /**
@@ -3104,8 +3150,8 @@ class HTMLPurifier_Context
     }
 }
 
-
-
+
+
 
 
 /**
@@ -3234,8 +3280,8 @@ abstract class HTMLPurifier_DefinitionCache
     abstract public function cleanup($config);
 }
 
-
-
+
+
 
 
 /**
@@ -3341,8 +3387,8 @@ class HTMLPurifier_DefinitionCacheFactory
     }
 }
 
-
-
+
+
 
 
 /**
@@ -3415,8 +3461,8 @@ class HTMLPurifier_Doctype
     }
 }
 
-
-
+
+
 
 
 class HTMLPurifier_DoctypeRegistry
@@ -3558,8 +3604,8 @@ class HTMLPurifier_DoctypeRegistry
     }
 }
 
-
-
+
+
 
 
 /**
@@ -3775,8 +3821,8 @@ class HTMLPurifier_ElementDef
     }
 }
 
-
-
+
+
 
 
 /**
@@ -4393,8 +4439,8 @@ class HTMLPurifier_Encoder
     }
 }
 
-
-
+
+
 
 
 /**
@@ -4442,8 +4488,8 @@ class HTMLPurifier_EntityLookup
     }
 }
 
-
-
+
+
 
 
 // if want to implement error collecting here, we'll need to use some sort
@@ -4564,7 +4610,7 @@ class HTMLPurifier_EntityParser
         $entity = $matches[0];
         $hex_part = @$matches[1];
         $dec_part = @$matches[2];
-        $named_part = empty($matches[3]) ? @$matches[4] : $matches[3];
+        $named_part = empty($matches[3]) ? (empty($matches[4]) ? "" : $matches[4]) : $matches[3];
         if ($hex_part !== NULL && $hex_part !== "") {
             return HTMLPurifier_Encoder::unichr(hexdec($hex_part));
         } elseif ($dec_part !== NULL && $dec_part !== "") {
@@ -4728,8 +4774,8 @@ class HTMLPurifier_EntityParser
     }
 }
 
-
-
+
+
 
 
 /**
@@ -4973,8 +5019,8 @@ class HTMLPurifier_ErrorCollector
     }
 }
 
-
-
+
+
 
 
 /**
@@ -5048,8 +5094,8 @@ class HTMLPurifier_ErrorStruct
     }
 }
 
-
-
+
+
 
 
 /**
@@ -5061,8 +5107,8 @@ class HTMLPurifier_Exception extends Exception
 
 }
 
-
-
+
+
 
 
 /**
@@ -5118,8 +5164,8 @@ class HTMLPurifier_Filter
     }
 }
 
-
-
+
+
 
 
 /**
@@ -5405,8 +5451,8 @@ class HTMLPurifier_Generator
     }
 }
 
-
-
+
+
 
 
 /**
@@ -5899,8 +5945,8 @@ class HTMLPurifier_HTMLDefinition extends HTMLPurifier_Definition
     }
 }
 
-
-
+
+
 
 
 /**
@@ -6184,8 +6230,8 @@ class HTMLPurifier_HTMLModule
     }
 }
 
-
-
+
+
 
 
 class HTMLPurifier_HTMLModuleManager
@@ -6652,8 +6698,8 @@ class HTMLPurifier_HTMLModuleManager
     }
 }
 
-
-
+
+
 
 
 /**
@@ -6710,8 +6756,8 @@ class HTMLPurifier_IDAccumulator
     }
 }
 
-
-
+
+
 
 
 /**
@@ -6871,11 +6917,13 @@ abstract class HTMLPurifier_Injector
             return false;
         }
         // check for exclusion
-        for ($i = count($this->currentNesting) - 2; $i >= 0; $i--) {
-            $node = $this->currentNesting[$i];
-            $def  = $this->htmlDefinition->info[$node->name];
-            if (isset($def->excludes[$name])) {
-                return false;
+        if (!empty($this->currentNesting)) {
+            for ($i = count($this->currentNesting) - 2; $i >= 0; $i--) {
+                $node = $this->currentNesting[$i];
+                $def  = $this->htmlDefinition->info[$node->name];
+                if (isset($def->excludes[$name])) {
+                    return false;
+                }
             }
         }
         return true;
@@ -6992,8 +7040,8 @@ abstract class HTMLPurifier_Injector
     }
 }
 
-
-
+
+
 
 
 /**
@@ -7197,8 +7245,8 @@ class HTMLPurifier_Language
     }
 }
 
-
-
+
+
 
 
 /**
@@ -7407,8 +7455,8 @@ class HTMLPurifier_LanguageFactory
     }
 }
 
-
-
+
+
 
 
 /**
@@ -7437,12 +7485,14 @@ class HTMLPurifier_Length
     protected $isValid;
 
     /**
-     * Array Lookup array of units recognized by CSS 2.1
+     * Array Lookup array of units recognized by CSS 3
      * @type array
      */
     protected static $allowedUnits = array(
         'em' => true, 'ex' => true, 'px' => true, 'in' => true,
-        'cm' => true, 'mm' => true, 'pt' => true, 'pc' => true
+        'cm' => true, 'mm' => true, 'pt' => true, 'pc' => true,
+        'ch' => true, 'rem' => true, 'vw' => true, 'vh' => true,
+        'vmin' => true, 'vmax' => true
     );
 
     /**
@@ -7568,8 +7618,8 @@ class HTMLPurifier_Length
     }
 }
 
-
-
+
+
 
 
 /**
@@ -7951,8 +8001,8 @@ class HTMLPurifier_Lexer
     }
 }
 
-
-
+
+
 
 
 /**
@@ -8001,8 +8051,8 @@ abstract class HTMLPurifier_Node
     abstract public function toTokenPair();
 }
 
-
-
+
+
 
 
 /**
@@ -8113,8 +8163,8 @@ class HTMLPurifier_PercentEncoder
     }
 }
 
-
-
+
+
 
 
 /**
@@ -8236,8 +8286,8 @@ class HTMLPurifier_PropertyList
     }
 }
 
-
-
+
+
 
 
 /**
@@ -8279,8 +8329,8 @@ class HTMLPurifier_PropertyListIterator extends FilterIterator
     }
 }
 
-
-
+
+
 
 
 /**
@@ -8337,7 +8387,7 @@ class HTMLPurifier_Queue {
         return empty($this->input) && empty($this->output);
     }
 }
-
+
 
 
 /**
@@ -8363,8 +8413,8 @@ abstract class HTMLPurifier_Strategy
     abstract public function execute($tokens, $config, $context);
 }
 
-
-
+
+
 
 
 /**
@@ -8411,8 +8461,8 @@ class HTMLPurifier_StringHash extends ArrayObject
     }
 }
 
-
-
+
+
 
 
 /**
@@ -8548,8 +8598,8 @@ class HTMLPurifier_StringHashParser
     }
 }
 
-
-
+
+
 
 
 /**
@@ -8586,8 +8636,8 @@ abstract class HTMLPurifier_TagTransform
     }
 }
 
-
-
+
+
 
 
 /**
@@ -8687,8 +8737,8 @@ abstract class HTMLPurifier_Token
     abstract public function toNode();
 }
 
-
-
+
+
 
 
 /**
@@ -8806,8 +8856,8 @@ class HTMLPurifier_TokenFactory
     }
 }
 
-
-
+
+
 
 
 /**
@@ -9123,8 +9173,8 @@ class HTMLPurifier_URI
     }
 }
 
-
-
+
+
 
 
 class HTMLPurifier_URIDefinition extends HTMLPurifier_Definition
@@ -9236,8 +9286,8 @@ class HTMLPurifier_URIDefinition extends HTMLPurifier_Definition
 
 }
 
-
-
+
+
 
 
 /**
@@ -9311,8 +9361,8 @@ abstract class HTMLPurifier_URIFilter
     abstract public function filter(&$uri, $config, $context);
 }
 
-
-
+
+
 
 
 /**
@@ -9383,8 +9433,8 @@ class HTMLPurifier_URIParser
 
 }
 
-
-
+
+
 
 
 /**
@@ -9486,8 +9536,8 @@ abstract class HTMLPurifier_URIScheme
     }
 }
 
-
-
+
+
 
 
 /**
@@ -9568,8 +9618,8 @@ class HTMLPurifier_URISchemeRegistry
     }
 }
 
-
-
+
+
 
 
 /**
@@ -9876,8 +9926,8 @@ class HTMLPurifier_UnitConverter
     }
 }
 
-
-
+
+
 
 
 /**
@@ -9887,34 +9937,34 @@ class HTMLPurifier_UnitConverter
 class HTMLPurifier_VarParser
 {
 
-    const STRING = 1;
+    const C_STRING = 1;
     const ISTRING = 2;
     const TEXT = 3;
     const ITEXT = 4;
-    const INT = 5;
-    const FLOAT = 6;
-    const BOOL = 7;
+    const C_INT = 5;
+    const C_FLOAT = 6;
+    const C_BOOL = 7;
     const LOOKUP = 8;
     const ALIST = 9;
     const HASH = 10;
-    const MIXED = 11;
+    const C_MIXED = 11;
 
     /**
      * Lookup table of allowed types. Mainly for backwards compatibility, but
      * also convenient for transforming string type names to the integer constants.
      */
     public static $types = array(
-        'string' => self::STRING,
+        'string' => self::C_STRING,
         'istring' => self::ISTRING,
         'text' => self::TEXT,
         'itext' => self::ITEXT,
-        'int' => self::INT,
-        'float' => self::FLOAT,
-        'bool' => self::BOOL,
+        'int' => self::C_INT,
+        'float' => self::C_FLOAT,
+        'bool' => self::C_BOOL,
         'lookup' => self::LOOKUP,
         'list' => self::ALIST,
         'hash' => self::HASH,
-        'mixed' => self::MIXED
+        'mixed' => self::C_MIXED
     );
 
     /**
@@ -9922,7 +9972,7 @@ class HTMLPurifier_VarParser
      * allowed value lists.
      */
     public static $stringTypes = array(
-        self::STRING => true,
+        self::C_STRING => true,
         self::ISTRING => true,
         self::TEXT => true,
         self::ITEXT => true,
@@ -9954,7 +10004,7 @@ class HTMLPurifier_VarParser
         // These are basic checks, to make sure nothing horribly wrong
         // happened in our implementations.
         switch ($type) {
-            case (self::STRING):
+            case (self::C_STRING):
             case (self::ISTRING):
             case (self::TEXT):
             case (self::ITEXT):
@@ -9965,17 +10015,17 @@ class HTMLPurifier_VarParser
                     $var = strtolower($var);
                 }
                 return $var;
-            case (self::INT):
+            case (self::C_INT):
                 if (!is_int($var)) {
                     break;
                 }
                 return $var;
-            case (self::FLOAT):
+            case (self::C_FLOAT):
                 if (!is_float($var)) {
                     break;
                 }
                 return $var;
-            case (self::BOOL):
+            case (self::C_BOOL):
                 if (!is_bool($var)) {
                     break;
                 }
@@ -9999,7 +10049,7 @@ class HTMLPurifier_VarParser
                     }
                 }
                 return $var;
-            case (self::MIXED):
+            case (self::C_MIXED):
                 return $var;
             default:
                 $this->errorInconsistent(get_class($this), $type);
@@ -10075,8 +10125,8 @@ class HTMLPurifier_VarParser
     }
 }
 
-
-
+
+
 
 
 /**
@@ -10087,8 +10137,8 @@ class HTMLPurifier_VarParserException extends HTMLPurifier_Exception
 
 }
 
-
-
+
+
 
 
 /**
@@ -10246,7 +10296,7 @@ class HTMLPurifier_Zipper
         return array($old, $r);
     }
 }
-
+
 
 
 /**
@@ -10382,8 +10432,8 @@ class HTMLPurifier_AttrDef_CSS extends HTMLPurifier_AttrDef
 
 }
 
-
-
+
+
 
 
 /**
@@ -10427,8 +10477,8 @@ class HTMLPurifier_AttrDef_Clone extends HTMLPurifier_AttrDef
     }
 }
 
-
-
+
+
 
 
 // Enum = Enumerated
@@ -10501,8 +10551,8 @@ class HTMLPurifier_AttrDef_Enum extends HTMLPurifier_AttrDef
     }
 }
 
-
-
+
+
 
 
 /**
@@ -10593,8 +10643,8 @@ class HTMLPurifier_AttrDef_Integer extends HTMLPurifier_AttrDef
     }
 }
 
-
-
+
+
 
 
 /**
@@ -10680,8 +10730,8 @@ class HTMLPurifier_AttrDef_Lang extends HTMLPurifier_AttrDef
     }
 }
 
-
-
+
+
 
 
 /**
@@ -10734,8 +10784,8 @@ class HTMLPurifier_AttrDef_Switch
     }
 }
 
-
-
+
+
 
 
 /**
@@ -10756,8 +10806,8 @@ class HTMLPurifier_AttrDef_Text extends HTMLPurifier_AttrDef
     }
 }
 
-
-
+
+
 
 
 /**
@@ -10868,8 +10918,8 @@ class HTMLPurifier_AttrDef_URI extends HTMLPurifier_AttrDef
     }
 }
 
-
-
+
+
 
 
 /**
@@ -10953,8 +11003,8 @@ class HTMLPurifier_AttrDef_CSS_Number extends HTMLPurifier_AttrDef
     }
 }
 
-
-
+
+
 
 
 class HTMLPurifier_AttrDef_CSS_AlphaValue extends HTMLPurifier_AttrDef_CSS_Number
@@ -10988,8 +11038,8 @@ class HTMLPurifier_AttrDef_CSS_AlphaValue extends HTMLPurifier_AttrDef_CSS_Numbe
     }
 }
 
-
-
+
+
 
 
 /**
@@ -11100,8 +11150,8 @@ class HTMLPurifier_AttrDef_CSS_Background extends HTMLPurifier_AttrDef
     }
 }
 
-
-
+
+
 
 
 /* W3C says:
@@ -11258,8 +11308,8 @@ class HTMLPurifier_AttrDef_CSS_BackgroundPosition extends HTMLPurifier_AttrDef
     }
 }
 
-
-
+
+
 
 
 /**
@@ -11315,8 +11365,8 @@ class HTMLPurifier_AttrDef_CSS_Border extends HTMLPurifier_AttrDef
     }
 }
 
-
-
+
+
 
 
 /**
@@ -11477,8 +11527,8 @@ class HTMLPurifier_AttrDef_CSS_Color extends HTMLPurifier_AttrDef
 
 }
 
-
-
+
+
 
 
 /**
@@ -11526,8 +11576,8 @@ class HTMLPurifier_AttrDef_CSS_Composite extends HTMLPurifier_AttrDef
     }
 }
 
-
-
+
+
 
 
 /**
@@ -11571,8 +11621,8 @@ class HTMLPurifier_AttrDef_CSS_DenyElementDecorator extends HTMLPurifier_AttrDef
     }
 }
 
-
-
+
+
 
 
 /**
@@ -11649,8 +11699,8 @@ class HTMLPurifier_AttrDef_CSS_Filter extends HTMLPurifier_AttrDef
     }
 }
 
-
-
+
+
 
 
 /**
@@ -11826,8 +11876,8 @@ class HTMLPurifier_AttrDef_CSS_Font extends HTMLPurifier_AttrDef
     }
 }
 
-
-
+
+
 
 
 /**
@@ -12046,8 +12096,8 @@ class HTMLPurifier_AttrDef_CSS_FontFamily extends HTMLPurifier_AttrDef
 
 }
 
-
-
+
+
 
 
 /**
@@ -12079,8 +12129,8 @@ class HTMLPurifier_AttrDef_CSS_Ident extends HTMLPurifier_AttrDef
     }
 }
 
-
-
+
+
 
 
 /**
@@ -12136,8 +12186,8 @@ class HTMLPurifier_AttrDef_CSS_ImportantDecorator extends HTMLPurifier_AttrDef
     }
 }
 
-
-
+
+
 
 
 /**
@@ -12214,8 +12264,8 @@ class HTMLPurifier_AttrDef_CSS_Length extends HTMLPurifier_AttrDef
     }
 }
 
-
-
+
+
 
 
 /**
@@ -12327,8 +12377,8 @@ class HTMLPurifier_AttrDef_CSS_ListStyle extends HTMLPurifier_AttrDef
     }
 }
 
-
-
+
+
 
 
 /**
@@ -12399,8 +12449,8 @@ class HTMLPurifier_AttrDef_CSS_Multiple extends HTMLPurifier_AttrDef
     }
 }
 
-
-
+
+
 
 
 /**
@@ -12454,8 +12504,8 @@ class HTMLPurifier_AttrDef_CSS_Percentage extends HTMLPurifier_AttrDef
     }
 }
 
-
-
+
+
 
 
 /**
@@ -12501,8 +12551,8 @@ class HTMLPurifier_AttrDef_CSS_TextDecoration extends HTMLPurifier_AttrDef
     }
 }
 
-
-
+
+
 
 
 /**
@@ -12579,8 +12629,8 @@ class HTMLPurifier_AttrDef_CSS_URI extends HTMLPurifier_AttrDef_URI
     }
 }
 
-
-
+
+
 
 
 /**
@@ -12628,8 +12678,8 @@ class HTMLPurifier_AttrDef_HTML_Bool extends HTMLPurifier_AttrDef
     }
 }
 
-
-
+
+
 
 
 /**
@@ -12699,8 +12749,8 @@ class HTMLPurifier_AttrDef_HTML_Nmtokens extends HTMLPurifier_AttrDef
     }
 }
 
-
-
+
+
 
 
 /**
@@ -12749,7 +12799,7 @@ class HTMLPurifier_AttrDef_HTML_Class extends HTMLPurifier_AttrDef_HTML_Nmtokens
         return $ret;
     }
 }
-
+
 
 
 /**
@@ -12800,8 +12850,8 @@ class HTMLPurifier_AttrDef_HTML_Color extends HTMLPurifier_AttrDef
     }
 }
 
-
-
+
+
 
 
 /**
@@ -12839,8 +12889,8 @@ class HTMLPurifier_AttrDef_HTML_FrameTarget extends HTMLPurifier_AttrDef_Enum
     }
 }
 
-
-
+
+
 
 
 /**
@@ -12953,8 +13003,8 @@ class HTMLPurifier_AttrDef_HTML_ID extends HTMLPurifier_AttrDef
     }
 }
 
-
-
+
+
 
 
 /**
@@ -13030,8 +13080,8 @@ class HTMLPurifier_AttrDef_HTML_Pixels extends HTMLPurifier_AttrDef
     }
 }
 
-
-
+
+
 
 
 /**
@@ -13087,8 +13137,8 @@ class HTMLPurifier_AttrDef_HTML_Length extends HTMLPurifier_AttrDef_HTML_Pixels
     }
 }
 
-
-
+
+
 
 
 /**
@@ -13160,8 +13210,8 @@ class HTMLPurifier_AttrDef_HTML_LinkTypes extends HTMLPurifier_AttrDef
     }
 }
 
-
-
+
+
 
 
 /**
@@ -13221,8 +13271,8 @@ class HTMLPurifier_AttrDef_HTML_MultiLength extends HTMLPurifier_AttrDef_HTML_Le
     }
 }
 
-
-
+
+
 
 
 abstract class HTMLPurifier_AttrDef_URI_Email extends HTMLPurifier_AttrDef
@@ -13242,8 +13292,8 @@ abstract class HTMLPurifier_AttrDef_URI_Email extends HTMLPurifier_AttrDef
 
 // sub-implementations
 
-
-
+
+
 
 
 /**
@@ -13343,7 +13393,11 @@ class HTMLPurifier_AttrDef_URI_Host extends HTMLPurifier_AttrDef
 
         // PHP 5.3 and later support this functionality natively
         if (function_exists('idn_to_ascii')) {
-            $string = idn_to_ascii($string);
+            if (defined('IDNA_NONTRANSITIONAL_TO_ASCII') && defined('INTL_IDNA_VARIANT_UTS46')) {
+                $string = idn_to_ascii($string, IDNA_NONTRANSITIONAL_TO_ASCII, INTL_IDNA_VARIANT_UTS46);
+            } else {
+                $string = idn_to_ascii($string);
+            }
 
         // If we have Net_IDNA2 support, we can support IRIs by
         // punycoding them. (This is the most portable thing to do,
@@ -13381,8 +13435,8 @@ class HTMLPurifier_AttrDef_URI_Host extends HTMLPurifier_AttrDef
     }
 }
 
-
-
+
+
 
 
 /**
@@ -13427,8 +13481,8 @@ class HTMLPurifier_AttrDef_URI_IPv4 extends HTMLPurifier_AttrDef
     }
 }
 
-
-
+
+
 
 
 /**
@@ -13517,8 +13571,8 @@ class HTMLPurifier_AttrDef_URI_IPv6 extends HTMLPurifier_AttrDef_URI_IPv4
     }
 }
 
-
-
+
+
 
 
 /**
@@ -13547,8 +13601,8 @@ class HTMLPurifier_AttrDef_URI_Email_SimpleCheck extends HTMLPurifier_AttrDef_UR
     }
 }
 
-
-
+
+
 
 
 /**
@@ -13576,8 +13630,8 @@ class HTMLPurifier_AttrTransform_Background extends HTMLPurifier_AttrTransform
     }
 }
 
-
-
+
+
 
 
 // this MUST be placed in post, as it assumes that any value in dir is valid
@@ -13604,8 +13658,8 @@ class HTMLPurifier_AttrTransform_BdoDir extends HTMLPurifier_AttrTransform
     }
 }
 
-
-
+
+
 
 
 /**
@@ -13633,8 +13687,8 @@ class HTMLPurifier_AttrTransform_BgColor extends HTMLPurifier_AttrTransform
     }
 }
 
-
-
+
+
 
 
 /**
@@ -13681,8 +13735,8 @@ class HTMLPurifier_AttrTransform_BoolToCSS extends HTMLPurifier_AttrTransform
     }
 }
 
-
-
+
+
 
 
 /**
@@ -13708,8 +13762,8 @@ class HTMLPurifier_AttrTransform_Border extends HTMLPurifier_AttrTransform
     }
 }
 
-
-
+
+
 
 
 /**
@@ -13777,8 +13831,8 @@ class HTMLPurifier_AttrTransform_EnumToCSS extends HTMLPurifier_AttrTransform
     }
 }
 
-
-
+
+
 
 
 // must be called POST validation
@@ -13825,8 +13879,8 @@ class HTMLPurifier_AttrTransform_ImgRequired extends HTMLPurifier_AttrTransform
     }
 }
 
-
-
+
+
 
 
 /**
@@ -13887,8 +13941,8 @@ class HTMLPurifier_AttrTransform_ImgSpace extends HTMLPurifier_AttrTransform
     }
 }
 
-
-
+
+
 
 
 /**
@@ -13944,8 +13998,8 @@ class HTMLPurifier_AttrTransform_Input extends HTMLPurifier_AttrTransform
     }
 }
 
-
-
+
+
 
 
 /**
@@ -13976,8 +14030,8 @@ class HTMLPurifier_AttrTransform_Lang extends HTMLPurifier_AttrTransform
     }
 }
 
-
-
+
+
 
 
 /**
@@ -14022,8 +14076,8 @@ class HTMLPurifier_AttrTransform_Length extends HTMLPurifier_AttrTransform
     }
 }
 
-
-
+
+
 
 
 /**
@@ -14056,8 +14110,8 @@ class HTMLPurifier_AttrTransform_Name extends HTMLPurifier_AttrTransform
     }
 }
 
-
-
+
+
 
 
 /**
@@ -14098,8 +14152,8 @@ class HTMLPurifier_AttrTransform_NameSync extends HTMLPurifier_AttrTransform
     }
 }
 
-
-
+
+
 
 
 // must be called POST validation
@@ -14151,8 +14205,8 @@ class HTMLPurifier_AttrTransform_Nofollow extends HTMLPurifier_AttrTransform
     }
 }
 
-
-
+
+
 
 
 class HTMLPurifier_AttrTransform_SafeEmbed extends HTMLPurifier_AttrTransform
@@ -14177,8 +14231,8 @@ class HTMLPurifier_AttrTransform_SafeEmbed extends HTMLPurifier_AttrTransform
     }
 }
 
-
-
+
+
 
 
 /**
@@ -14206,8 +14260,8 @@ class HTMLPurifier_AttrTransform_SafeObject extends HTMLPurifier_AttrTransform
     }
 }
 
-
-
+
+
 
 
 /**
@@ -14286,8 +14340,8 @@ class HTMLPurifier_AttrTransform_SafeParam extends HTMLPurifier_AttrTransform
     }
 }
 
-
-
+
+
 
 
 /**
@@ -14310,8 +14364,8 @@ class HTMLPurifier_AttrTransform_ScriptRequired extends HTMLPurifier_AttrTransfo
     }
 }
 
-
-
+
+
 
 
 // must be called POST validation
@@ -14356,8 +14410,8 @@ class HTMLPurifier_AttrTransform_TargetBlank extends HTMLPurifier_AttrTransform
     }
 }
 
-
-
+
+
 
 
 // must be called POST validation
@@ -14395,7 +14449,7 @@ class HTMLPurifier_AttrTransform_TargetNoopener extends HTMLPurifier_AttrTransfo
     }
 }
 
-
+
 
 
 // must be called POST validation
@@ -14433,7 +14487,7 @@ class HTMLPurifier_AttrTransform_TargetNoreferrer extends HTMLPurifier_AttrTrans
     }
 }
 
-
+
 
 
 /**
@@ -14460,8 +14514,8 @@ class HTMLPurifier_AttrTransform_Textarea extends HTMLPurifier_AttrTransform
     }
 }
 
-
-
+
+
 
 
 /**
@@ -14528,8 +14582,8 @@ class HTMLPurifier_ChildDef_Chameleon extends HTMLPurifier_ChildDef
     }
 }
 
-
-
+
+
 
 
 /**
@@ -14631,8 +14685,8 @@ class HTMLPurifier_ChildDef_Custom extends HTMLPurifier_ChildDef
     }
 }
 
-
-
+
+
 
 
 /**
@@ -14670,8 +14724,8 @@ class HTMLPurifier_ChildDef_Empty extends HTMLPurifier_ChildDef
     }
 }
 
-
-
+
+
 
 
 /**
@@ -14763,8 +14817,8 @@ class HTMLPurifier_ChildDef_List extends HTMLPurifier_ChildDef
     }
 }
 
-
-
+
+
 
 
 /**
@@ -14882,8 +14936,8 @@ class HTMLPurifier_ChildDef_Required extends HTMLPurifier_ChildDef
     }
 }
 
-
-
+
+
 
 
 /**
@@ -14928,8 +14982,8 @@ class HTMLPurifier_ChildDef_Optional extends HTMLPurifier_ChildDef_Required
     }
 }
 
-
-
+
+
 
 
 /**
@@ -15039,8 +15093,8 @@ class HTMLPurifier_ChildDef_StrictBlockquote extends HTMLPurifier_ChildDef_Requi
     }
 }
 
-
-
+
+
 
 
 /**
@@ -15264,8 +15318,8 @@ class HTMLPurifier_ChildDef_Table extends HTMLPurifier_ChildDef
     }
 }
 
-
-
+
+
 
 
 class HTMLPurifier_DefinitionCache_Decorator extends HTMLPurifier_DefinitionCache
@@ -15377,8 +15431,8 @@ class HTMLPurifier_DefinitionCache_Decorator extends HTMLPurifier_DefinitionCach
     }
 }
 
-
-
+
+
 
 
 /**
@@ -15454,8 +15508,8 @@ class HTMLPurifier_DefinitionCache_Null extends HTMLPurifier_DefinitionCache
     }
 }
 
-
-
+
+
 
 
 class HTMLPurifier_DefinitionCache_Serializer extends HTMLPurifier_DefinitionCache
@@ -15675,9 +15729,14 @@ class HTMLPurifier_DefinitionCache_Serializer extends HTMLPurifier_DefinitionCac
         $directory = $this->generateDirectoryPath($config);
         $chmod = $config->get('Cache.SerializerPermissions');
         if ($chmod === null) {
-            // TODO: This races
-            if (is_dir($directory)) return true;
-            return mkdir($directory);
+            if (!@mkdir($directory) && !is_dir($directory)) {
+                trigger_error(
+                    'Could not create directory ' . $directory . '',
+                    E_USER_WARNING
+                );
+                return false;
+            }
+            return true;
         }
         if (!is_dir($directory)) {
             $base = $this->generateBaseDirectoryPath($config);
@@ -15691,7 +15750,7 @@ class HTMLPurifier_DefinitionCache_Serializer extends HTMLPurifier_DefinitionCac
             } elseif (!$this->_testPermissions($base, $chmod)) {
                 return false;
             }
-            if (!mkdir($directory, $chmod)) {
+            if (!@mkdir($directory, $chmod) && !is_dir($directory)) {
                 trigger_error(
                     'Could not create directory ' . $directory . '',
                     E_USER_WARNING
@@ -15761,8 +15820,8 @@ class HTMLPurifier_DefinitionCache_Serializer extends HTMLPurifier_DefinitionCac
     }
 }
 
-
-
+
+
 
 
 /**
@@ -15840,8 +15899,8 @@ class HTMLPurifier_DefinitionCache_Decorator_Cleanup extends HTMLPurifier_Defini
     }
 }
 
-
-
+
+
 
 
 /**
@@ -15926,8 +15985,8 @@ class HTMLPurifier_DefinitionCache_Decorator_Memory extends HTMLPurifier_Definit
     }
 }
 
-
-
+
+
 
 
 /**
@@ -15971,8 +16030,8 @@ class HTMLPurifier_HTMLModule_Bdo extends HTMLPurifier_HTMLModule
     }
 }
 
-
-
+
+
 
 
 class HTMLPurifier_HTMLModule_CommonAttributes extends HTMLPurifier_HTMLModule
@@ -16003,8 +16062,8 @@ class HTMLPurifier_HTMLModule_CommonAttributes extends HTMLPurifier_HTMLModule
     );
 }
 
-
-
+
+
 
 
 /**
@@ -16059,8 +16118,8 @@ class HTMLPurifier_HTMLModule_Edit extends HTMLPurifier_HTMLModule
     }
 }
 
-
-
+
+
 
 
 /**
@@ -16250,8 +16309,8 @@ class HTMLPurifier_HTMLModule_Forms extends HTMLPurifier_HTMLModule
     }
 }
 
-
-
+
+
 
 
 /**
@@ -16291,8 +16350,8 @@ class HTMLPurifier_HTMLModule_Hypertext extends HTMLPurifier_HTMLModule
     }
 }
 
-
-
+
+
 
 
 /**
@@ -16343,8 +16402,8 @@ class HTMLPurifier_HTMLModule_Iframe extends HTMLPurifier_HTMLModule
     }
 }
 
-
-
+
+
 
 
 /**
@@ -16393,8 +16452,8 @@ class HTMLPurifier_HTMLModule_Image extends HTMLPurifier_HTMLModule
     }
 }
 
-
-
+
+
 
 
 /**
@@ -16580,8 +16639,8 @@ class HTMLPurifier_HTMLModule_Legacy extends HTMLPurifier_HTMLModule
     }
 }
 
-
-
+
+
 
 
 /**
@@ -16632,8 +16691,8 @@ class HTMLPurifier_HTMLModule_List extends HTMLPurifier_HTMLModule
     }
 }
 
-
-
+
+
 
 
 class HTMLPurifier_HTMLModule_Name extends HTMLPurifier_HTMLModule
@@ -16659,8 +16718,8 @@ class HTMLPurifier_HTMLModule_Name extends HTMLPurifier_HTMLModule
     }
 }
 
-
-
+
+
 
 
 /**
@@ -16685,8 +16744,8 @@ class HTMLPurifier_HTMLModule_Nofollow extends HTMLPurifier_HTMLModule
     }
 }
 
-
-
+
+
 
 
 class HTMLPurifier_HTMLModule_NonXMLCommonAttributes extends HTMLPurifier_HTMLModule
@@ -16706,8 +16765,8 @@ class HTMLPurifier_HTMLModule_NonXMLCommonAttributes extends HTMLPurifier_HTMLMo
     );
 }
 
-
-
+
+
 
 
 /**
@@ -16769,8 +16828,8 @@ class HTMLPurifier_HTMLModule_Object extends HTMLPurifier_HTMLModule
     }
 }
 
-
-
+
+
 
 
 /**
@@ -16812,8 +16871,8 @@ class HTMLPurifier_HTMLModule_Presentation extends HTMLPurifier_HTMLModule
     }
 }
 
-
-
+
+
 
 
 /**
@@ -16853,8 +16912,8 @@ class HTMLPurifier_HTMLModule_Proprietary extends HTMLPurifier_HTMLModule
     }
 }
 
-
-
+
+
 
 
 /**
@@ -16890,8 +16949,8 @@ class HTMLPurifier_HTMLModule_Ruby extends HTMLPurifier_HTMLModule
     }
 }
 
-
-
+
+
 
 
 /**
@@ -16931,8 +16990,8 @@ class HTMLPurifier_HTMLModule_SafeEmbed extends HTMLPurifier_HTMLModule
     }
 }
 
-
-
+
+
 
 
 /**
@@ -16994,8 +17053,8 @@ class HTMLPurifier_HTMLModule_SafeObject extends HTMLPurifier_HTMLModule
     }
 }
 
-
-
+
+
 
 
 /**
@@ -17021,13 +17080,13 @@ class HTMLPurifier_HTMLModule_SafeScripting extends HTMLPurifier_HTMLModule
         $script = $this->addElement(
             'script',
             'Inline',
-            'Empty',
+            'Optional:', // Not `Empty` to not allow to autoclose the <script /> tag @see https://www.w3.org/TR/html4/interact/scripts.html
             null,
             array(
                 // While technically not required by the spec, we're forcing
                 // it to this value.
                 'type' => 'Enum#text/javascript',
-                'src*' => new HTMLPurifier_AttrDef_Enum(array_keys($allowed))
+                'src*' => new HTMLPurifier_AttrDef_Enum(array_keys($allowed), /*case sensitive*/ true)
             )
         );
         $script->attr_transform_pre[] =
@@ -17035,8 +17094,8 @@ class HTMLPurifier_HTMLModule_SafeScripting extends HTMLPurifier_HTMLModule
     }
 }
 
-
-
+
+
 
 
 /*
@@ -17109,8 +17168,8 @@ class HTMLPurifier_HTMLModule_Scripting extends HTMLPurifier_HTMLModule
     }
 }
 
-
-
+
+
 
 
 /**
@@ -17143,8 +17202,8 @@ class HTMLPurifier_HTMLModule_StyleAttribute extends HTMLPurifier_HTMLModule
     }
 }
 
-
-
+
+
 
 
 /**
@@ -17219,8 +17278,8 @@ class HTMLPurifier_HTMLModule_Tables extends HTMLPurifier_HTMLModule
     }
 }
 
-
-
+
+
 
 
 /**
@@ -17248,8 +17307,8 @@ class HTMLPurifier_HTMLModule_Target extends HTMLPurifier_HTMLModule
     }
 }
 
-
-
+
+
 
 
 /**
@@ -17273,8 +17332,8 @@ class HTMLPurifier_HTMLModule_TargetBlank extends HTMLPurifier_HTMLModule
     }
 }
 
-
-
+
+
 
 
 /**
@@ -17296,7 +17355,7 @@ class HTMLPurifier_HTMLModule_TargetNoopener extends HTMLPurifier_HTMLModule
         $a->attr_transform_post[] = new HTMLPurifier_AttrTransform_TargetNoopener();
     }
 }
-
+
 
 
 /**
@@ -17318,7 +17377,7 @@ class HTMLPurifier_HTMLModule_TargetNoreferrer extends HTMLPurifier_HTMLModule
         $a->attr_transform_post[] = new HTMLPurifier_AttrTransform_TargetNoreferrer();
     }
 }
-
+
 
 
 /**
@@ -17405,8 +17464,8 @@ class HTMLPurifier_HTMLModule_Text extends HTMLPurifier_HTMLModule
     }
 }
 
-
-
+
+
 
 
 /**
@@ -17636,8 +17695,8 @@ class HTMLPurifier_HTMLModule_Tidy extends HTMLPurifier_HTMLModule
     }
 }
 
-
-
+
+
 
 
 class HTMLPurifier_HTMLModule_XMLCommonAttributes extends HTMLPurifier_HTMLModule
@@ -17657,8 +17716,8 @@ class HTMLPurifier_HTMLModule_XMLCommonAttributes extends HTMLPurifier_HTMLModul
     );
 }
 
-
-
+
+
 
 
 /**
@@ -17691,8 +17750,8 @@ class HTMLPurifier_HTMLModule_Tidy_Name extends HTMLPurifier_HTMLModule_Tidy
     }
 }
 
-
-
+
+
 
 
 class HTMLPurifier_HTMLModule_Tidy_Proprietary extends HTMLPurifier_HTMLModule_Tidy
@@ -17726,8 +17785,8 @@ class HTMLPurifier_HTMLModule_Tidy_Proprietary extends HTMLPurifier_HTMLModule_T
     }
 }
 
-
-
+
+
 
 
 class HTMLPurifier_HTMLModule_Tidy_XHTMLAndHTML4 extends HTMLPurifier_HTMLModule_Tidy
@@ -17906,8 +17965,8 @@ class HTMLPurifier_HTMLModule_Tidy_XHTMLAndHTML4 extends HTMLPurifier_HTMLModule
     }
 }
 
-
-
+
+
 
 
 class HTMLPurifier_HTMLModule_Tidy_Strict extends HTMLPurifier_HTMLModule_Tidy_XHTMLAndHTML4
@@ -17950,8 +18009,8 @@ class HTMLPurifier_HTMLModule_Tidy_Strict extends HTMLPurifier_HTMLModule_Tidy_X
     }
 }
 
-
-
+
+
 
 
 class HTMLPurifier_HTMLModule_Tidy_Transitional extends HTMLPurifier_HTMLModule_Tidy_XHTMLAndHTML4
@@ -17967,8 +18026,8 @@ class HTMLPurifier_HTMLModule_Tidy_Transitional extends HTMLPurifier_HTMLModule_
     public $defaultLevel = 'heavy';
 }
 
-
-
+
+
 
 
 class HTMLPurifier_HTMLModule_Tidy_XHTML extends HTMLPurifier_HTMLModule_Tidy
@@ -17994,8 +18053,8 @@ class HTMLPurifier_HTMLModule_Tidy_XHTML extends HTMLPurifier_HTMLModule_Tidy
     }
 }
 
-
-
+
+
 
 
 /**
@@ -18351,8 +18410,8 @@ class HTMLPurifier_Injector_AutoParagraph extends HTMLPurifier_Injector
     }
 }
 
-
-
+
+
 
 
 /**
@@ -18392,8 +18451,8 @@ class HTMLPurifier_Injector_DisplayLinkURI extends HTMLPurifier_Injector
     }
 }
 
-
-
+
+
 
 
 /**
@@ -18457,8 +18516,8 @@ class HTMLPurifier_Injector_Linkify extends HTMLPurifier_Injector
     }
 }
 
-
-
+
+
 
 
 /**
@@ -18529,8 +18588,8 @@ class HTMLPurifier_Injector_PurifierLinkify extends HTMLPurifier_Injector
     }
 }
 
-
-
+
+
 
 
 class HTMLPurifier_Injector_RemoveEmpty extends HTMLPurifier_Injector
@@ -18642,8 +18701,8 @@ class HTMLPurifier_Injector_RemoveEmpty extends HTMLPurifier_Injector
     }
 }
 
-
-
+
+
 
 
 /**
@@ -18727,8 +18786,8 @@ class HTMLPurifier_Injector_RemoveSpansWithoutAttributes extends HTMLPurifier_In
     }
 }
 
-
-
+
+
 
 
 /**
@@ -18852,8 +18911,8 @@ class HTMLPurifier_Injector_SafeObject extends HTMLPurifier_Injector
     }
 }
 
-
-
+
+
 
 
 /**
@@ -18924,8 +18983,13 @@ class HTMLPurifier_Lexer_DOMLex extends HTMLPurifier_Lexer
         $doc = new DOMDocument();
         $doc->encoding = 'UTF-8'; // theoretically, the above has this covered
 
+        $options = 0;
+        if ($config->get('Core.AllowParseManyTags') && defined('LIBXML_PARSEHUGE')) {
+            $options |= LIBXML_PARSEHUGE;
+        }
+
         set_error_handler(array($this, 'muteErrorHandler'));
-        $doc->loadHTML($html);
+        $doc->loadHTML($html, $options);
         restore_error_handler();
 
         $body = $doc->getElementsByTagName('html')->item(0)-> // <html>
@@ -18982,6 +19046,41 @@ class HTMLPurifier_Lexer_DOMLex extends HTMLPurifier_Lexer
         } while ($level > 0);
     }
 
+    /**
+     * Portably retrieve the tag name of a node; deals with older versions
+     * of libxml like 2.7.6
+     * @param DOMNode $node
+     */
+    protected function getTagName($node)
+    {
+        if (isset($node->tagName)) {
+            return $node->tagName;
+        } else if (isset($node->nodeName)) {
+            return $node->nodeName;
+        } else if (isset($node->localName)) {
+            return $node->localName;
+        }
+        return null;
+    }
+
+    /**
+     * Portably retrieve the data of a node; deals with older versions
+     * of libxml like 2.7.6
+     * @param DOMNode $node
+     */
+    protected function getData($node)
+    {
+        if (isset($node->data)) {
+            return $node->data;
+        } else if (isset($node->nodeValue)) {
+            return $node->nodeValue;
+        } else if (isset($node->textContent)) {
+            return $node->textContent;
+        }
+        return null;
+    }
+
+
     /**
      * @param DOMNode $node DOMNode to be tokenized.
      * @param HTMLPurifier_Token[] $tokens   Array-list of already tokenized tokens.
@@ -18997,7 +19096,10 @@ class HTMLPurifier_Lexer_DOMLex extends HTMLPurifier_Lexer
         // but we're not getting the character reference nodes because
         // those should have been preprocessed
         if ($node->nodeType === XML_TEXT_NODE) {
-            $tokens[] = $this->factory->createText($node->data);
+            $data = $this->getData($node); // Handle variable data property
+            if ($data !== null) {
+              $tokens[] = $this->factory->createText($data);
+            }
             return false;
         } elseif ($node->nodeType === XML_CDATA_SECTION_NODE) {
             // undo libxml's special treatment of <script> and <style> tags
@@ -19027,21 +19129,20 @@ class HTMLPurifier_Lexer_DOMLex extends HTMLPurifier_Lexer
             // not-well tested: there may be other nodes we have to grab
             return false;
         }
-
         $attr = $node->hasAttributes() ? $this->transformAttrToAssoc($node->attributes) : array();
-
+        $tag_name = $this->getTagName($node); // Handle variable tagName property
+        if (empty($tag_name)) {
+            return (bool) $node->childNodes->length;
+        }
         // We still have to make sure that the element actually IS empty
         if (!$node->childNodes->length) {
             if ($collect) {
-                $tokens[] = $this->factory->createEmpty($node->tagName, $attr);
+                $tokens[] = $this->factory->createEmpty($tag_name, $attr);
             }
             return false;
         } else {
             if ($collect) {
-                $tokens[] = $this->factory->createStart(
-                    $tag_name = $node->tagName, // somehow, it get's dropped
-                    $attr
-                );
+                $tokens[] = $this->factory->createStart($tag_name, $attr);
             }
             return true;
         }
@@ -19053,10 +19154,10 @@ class HTMLPurifier_Lexer_DOMLex extends HTMLPurifier_Lexer
      */
     protected function createEndNode($node, &$tokens)
     {
-        $tokens[] = $this->factory->createEnd($node->tagName);
+        $tag_name = $this->getTagName($node); // Handle variable tagName property
+        $tokens[] = $this->factory->createEnd($tag_name);
     }
 
-
     /**
      * Converts a DOMNamedNodeMap of DOMAttr objects into an assoc array.
      *
@@ -19144,8 +19245,8 @@ class HTMLPurifier_Lexer_DOMLex extends HTMLPurifier_Lexer
     }
 }
 
-
-
+
+
 
 
 /**
@@ -19684,8 +19785,8 @@ class HTMLPurifier_Lexer_DirectLex extends HTMLPurifier_Lexer
     }
 }
 
-
-
+
+
 
 
 /**
@@ -19722,7 +19823,7 @@ class HTMLPurifier_Node_Comment extends HTMLPurifier_Node
         return array(new HTMLPurifier_Token_Comment($this->data, $this->line, $this->col), null);
     }
 }
-
+
 
 
 /**
@@ -19782,7 +19883,7 @@ class HTMLPurifier_Node_Element extends HTMLPurifier_Node
     }
 }
 
-
+
 
 
 /**
@@ -19836,8 +19937,8 @@ class HTMLPurifier_Node_Text extends HTMLPurifier_Node
     }
 }
 
-
-
+
+
 
 
 /**
@@ -19867,8 +19968,8 @@ abstract class HTMLPurifier_Strategy_Composite extends HTMLPurifier_Strategy
     }
 }
 
-
-
+
+
 
 
 /**
@@ -19885,8 +19986,8 @@ class HTMLPurifier_Strategy_Core extends HTMLPurifier_Strategy_Composite
     }
 }
 
-
-
+
+
 
 
 /**
@@ -20067,8 +20168,8 @@ class HTMLPurifier_Strategy_FixNesting extends HTMLPurifier_Strategy
     }
 }
 
-
-
+
+
 
 
 /**
@@ -20727,8 +20828,8 @@ class HTMLPurifier_Strategy_MakeWellFormed extends HTMLPurifier_Strategy
 // defined, and in any case you probably wanted to operate on trees,
 // not token streams.
 
-
-
+
+
 
 
 /**
@@ -20935,8 +21036,8 @@ class HTMLPurifier_Strategy_RemoveForeignElements extends HTMLPurifier_Strategy
     }
 }
 
-
-
+
+
 
 
 /**
@@ -20981,8 +21082,8 @@ class HTMLPurifier_Strategy_ValidateAttributes extends HTMLPurifier_Strategy
     }
 }
 
-
-
+
+
 
 
 /**
@@ -21096,8 +21197,8 @@ class HTMLPurifier_TagTransform_Font extends HTMLPurifier_TagTransform
     }
 }
 
-
-
+
+
 
 
 /**
@@ -21141,8 +21242,8 @@ class HTMLPurifier_TagTransform_Simple extends HTMLPurifier_TagTransform
     }
 }
 
-
-
+
+
 
 
 /**
@@ -21180,8 +21281,8 @@ class HTMLPurifier_Token_Comment extends HTMLPurifier_Token
     }
 }
 
-
-
+
+
 
 
 /**
@@ -21249,8 +21350,8 @@ abstract class HTMLPurifier_Token_Tag extends HTMLPurifier_Token
     }
 }
 
-
-
+
+
 
 
 /**
@@ -21265,8 +21366,8 @@ class HTMLPurifier_Token_Empty extends HTMLPurifier_Token_Tag
     }
 }
 
-
-
+
+
 
 
 /**
@@ -21290,8 +21391,8 @@ class HTMLPurifier_Token_End extends HTMLPurifier_Token_Tag
     }
 }
 
-
-
+
+
 
 
 /**
@@ -21301,8 +21402,8 @@ class HTMLPurifier_Token_Start extends HTMLPurifier_Token_Tag
 {
 }
 
-
-
+
+
 
 
 /**
@@ -21355,8 +21456,8 @@ class HTMLPurifier_Token_Text extends HTMLPurifier_Token
     }
 }
 
-
-
+
+
 
 
 class HTMLPurifier_URIFilter_DisableExternal extends HTMLPurifier_URIFilter
@@ -21410,8 +21511,8 @@ class HTMLPurifier_URIFilter_DisableExternal extends HTMLPurifier_URIFilter
     }
 }
 
-
-
+
+
 
 
 class HTMLPurifier_URIFilter_DisableExternalResources extends HTMLPurifier_URIFilter_DisableExternal
@@ -21436,8 +21537,8 @@ class HTMLPurifier_URIFilter_DisableExternalResources extends HTMLPurifier_URIFi
     }
 }
 
-
-
+
+
 
 
 class HTMLPurifier_URIFilter_DisableResources extends HTMLPurifier_URIFilter
@@ -21459,8 +21560,8 @@ class HTMLPurifier_URIFilter_DisableResources extends HTMLPurifier_URIFilter
     }
 }
 
-
-
+
+
 
 
 // It's not clear to me whether or not Punycode means that hostnames
@@ -21506,8 +21607,8 @@ class HTMLPurifier_URIFilter_HostBlacklist extends HTMLPurifier_URIFilter
     }
 }
 
-
-
+
+
 
 
 // does not support network paths
@@ -21665,8 +21766,8 @@ class HTMLPurifier_URIFilter_MakeAbsolute extends HTMLPurifier_URIFilter
     }
 }
 
-
-
+
+
 
 
 class HTMLPurifier_URIFilter_Munge extends HTMLPurifier_URIFilter
@@ -21781,8 +21882,8 @@ class HTMLPurifier_URIFilter_Munge extends HTMLPurifier_URIFilter
     }
 }
 
-
-
+
+
 
 
 /**
@@ -21850,8 +21951,8 @@ class HTMLPurifier_URIFilter_SafeIframe extends HTMLPurifier_URIFilter
     }
 }
 
-
-
+
+
 
 
 /**
@@ -21988,7 +22089,7 @@ class HTMLPurifier_URIScheme_data extends HTMLPurifier_URIScheme
     {
     }
 }
-
+
 
 
 /**
@@ -22032,8 +22133,8 @@ class HTMLPurifier_URIScheme_file extends HTMLPurifier_URIScheme
     }
 }
 
-
-
+
+
 
 
 /**
@@ -22091,8 +22192,8 @@ class HTMLPurifier_URIScheme_ftp extends HTMLPurifier_URIScheme
     }
 }
 
-
-
+
+
 
 
 /**
@@ -22128,8 +22229,8 @@ class HTMLPurifier_URIScheme_http extends HTMLPurifier_URIScheme
     }
 }
 
-
-
+
+
 
 
 /**
@@ -22147,8 +22248,8 @@ class HTMLPurifier_URIScheme_https extends HTMLPurifier_URIScheme_http
     public $secure = true;
 }
 
-
-
+
+
 
 
 // VERY RELAXED! Shouldn't cause problems, not even Firefox checks if the
@@ -22188,8 +22289,8 @@ class HTMLPurifier_URIScheme_mailto extends HTMLPurifier_URIScheme
     }
 }
 
-
-
+
+
 
 
 /**
@@ -22224,8 +22325,8 @@ class HTMLPurifier_URIScheme_news extends HTMLPurifier_URIScheme
     }
 }
 
-
-
+
+
 
 
 /**
@@ -22257,8 +22358,8 @@ class HTMLPurifier_URIScheme_nntp extends HTMLPurifier_URIScheme
     }
 }
 
-
-
+
+
 
 
 /**
@@ -22304,8 +22405,8 @@ class HTMLPurifier_URIScheme_tel extends HTMLPurifier_URIScheme
     }
 }
 
-
-
+
+
 
 
 /**
@@ -22331,23 +22432,23 @@ class HTMLPurifier_VarParser_Flexible extends HTMLPurifier_VarParser
             // Note: if code "breaks" from the switch, it triggers a generic
             // exception to be thrown. Specific errors can be specifically
             // done here.
-            case self::MIXED:
+            case self::C_MIXED:
             case self::ISTRING:
-            case self::STRING:
+            case self::C_STRING:
             case self::TEXT:
             case self::ITEXT:
                 return $var;
-            case self::INT:
+            case self::C_INT:
                 if (is_string($var) && ctype_digit($var)) {
                     $var = (int)$var;
                 }
                 return $var;
-            case self::FLOAT:
+            case self::C_FLOAT:
                 if ((is_string($var) && is_numeric($var)) || is_int($var)) {
                     $var = (float)$var;
                 }
                 return $var;
-            case self::BOOL:
+            case self::C_BOOL:
                 if (is_int($var) && ($var === 0 || $var === 1)) {
                     $var = (bool)$var;
                 } elseif (is_string($var)) {
@@ -22435,8 +22536,8 @@ class HTMLPurifier_VarParser_Flexible extends HTMLPurifier_VarParser
     }
 }
 
-
-
+
+
 
 
 /**
@@ -22474,5 +22575,5 @@ class HTMLPurifier_VarParser_Native extends HTMLPurifier_VarParser
     }
 }
 
-
-
+
+
diff --git a/wire/modules/Markup/MarkupHTMLPurifier/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema.ser b/wire/modules/Markup/MarkupHTMLPurifier/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema.ser
index 371e948f1c76d99bacea65b4735454656858edbf..47bd259b2efdf3d6d2575c014ed265ee5552f56d 100644
GIT binary patch
literal 24124
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
a_H6u1C9S6MM^&x$Njj%qTh09W=l=j>&lV{F

delta 203
zcmdn9hjDYw1an5y&1;pz*e0uKSu&ejRZrFxl%0IeLSizHx%A|X*3y%&m`P2ZU?DwO
z!9Zp*lZ4ddLjsbM9~($bo^K{OIa^zD@=`6y$ycl-C+liUO}=ai)MFsN`L*>suE{CN
b9<(uAo}1BP@>*rt%^L2y?3*k6j_?Bj6thNq

diff --git a/wire/modules/Markup/MarkupHTMLPurifier/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt b/wire/modules/Markup/MarkupHTMLPurifier/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt
index 5f355d66..e557ad21 100644
--- a/wire/modules/Markup/MarkupHTMLPurifier/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt
+++ b/wire/modules/Markup/MarkupHTMLPurifier/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt
@@ -6,7 +6,7 @@ DEFAULT: false
 <p>
   When enabled, HTML Purifier will treat any elements that contain only
   non-breaking spaces as well as regular whitespace as empty, and remove
-  them when %AutoForamt.RemoveEmpty is enabled.
+  them when %AutoFormat.RemoveEmpty is enabled.
 </p>
 <p>
   See %AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions for a list of elements
diff --git a/wire/modules/Markup/MarkupHTMLPurifier/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.AllowParseManyTags.txt b/wire/modules/Markup/MarkupHTMLPurifier/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.AllowParseManyTags.txt
new file mode 100644
index 00000000..b4b9b102
--- /dev/null
+++ b/wire/modules/Markup/MarkupHTMLPurifier/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.AllowParseManyTags.txt
@@ -0,0 +1,12 @@
+Core.AllowParseManyTags
+TYPE: bool
+DEFAULT: false
+VERSION: 4.10.1
+--DESCRIPTION--
+<p>
+    This directive allows parsing of many nested tags.
+    If you set true, relaxes any hardcoded limit from the parser.
+    However, in that case it may cause a Dos attack.
+    Be careful when enabling it.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/wire/modules/Markup/MarkupHTMLPurifier/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt b/wire/modules/Markup/MarkupHTMLPurifier/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt
index f7823982..fc100868 100644
--- a/wire/modules/Markup/MarkupHTMLPurifier/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt
+++ b/wire/modules/Markup/MarkupHTMLPurifier/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt
@@ -3,23 +3,154 @@ TYPE: hash
 VERSION: 2.0.0
 --DEFAULT--
 array (
-  'maroon' => '#800000',
-  'red' => '#FF0000',
-  'orange' => '#FFA500',
-  'yellow' => '#FFFF00',
-  'olive' => '#808000',
-  'purple' => '#800080',
-  'fuchsia' => '#FF00FF',
-  'white' => '#FFFFFF',
-  'lime' => '#00FF00',
-  'green' => '#008000',
-  'navy' => '#000080',
-  'blue' => '#0000FF',
+  'aliceblue' => '#F0F8FF',
+  'antiquewhite' => '#FAEBD7',
   'aqua' => '#00FFFF',
-  'teal' => '#008080',
+  'aquamarine' => '#7FFFD4',
+  'azure' => '#F0FFFF',
+  'beige' => '#F5F5DC',
+  'bisque' => '#FFE4C4',
   'black' => '#000000',
-  'silver' => '#C0C0C0',
+  'blanchedalmond' => '#FFEBCD',
+  'blue' => '#0000FF',
+  'blueviolet' => '#8A2BE2',
+  'brown' => '#A52A2A',
+  'burlywood' => '#DEB887',
+  'cadetblue' => '#5F9EA0',
+  'chartreuse' => '#7FFF00',
+  'chocolate' => '#D2691E',
+  'coral' => '#FF7F50',
+  'cornflowerblue' => '#6495ED',
+  'cornsilk' => '#FFF8DC',
+  'crimson' => '#DC143C',
+  'cyan' => '#00FFFF',
+  'darkblue' => '#00008B',
+  'darkcyan' => '#008B8B',
+  'darkgoldenrod' => '#B8860B',
+  'darkgray' => '#A9A9A9',
+  'darkgrey' => '#A9A9A9',
+  'darkgreen' => '#006400',
+  'darkkhaki' => '#BDB76B',
+  'darkmagenta' => '#8B008B',
+  'darkolivegreen' => '#556B2F',
+  'darkorange' => '#FF8C00',
+  'darkorchid' => '#9932CC',
+  'darkred' => '#8B0000',
+  'darksalmon' => '#E9967A',
+  'darkseagreen' => '#8FBC8F',
+  'darkslateblue' => '#483D8B',
+  'darkslategray' => '#2F4F4F',
+  'darkslategrey' => '#2F4F4F',
+  'darkturquoise' => '#00CED1',
+  'darkviolet' => '#9400D3',
+  'deeppink' => '#FF1493',
+  'deepskyblue' => '#00BFFF',
+  'dimgray' => '#696969',
+  'dimgrey' => '#696969',
+  'dodgerblue' => '#1E90FF',
+  'firebrick' => '#B22222',
+  'floralwhite' => '#FFFAF0',
+  'forestgreen' => '#228B22',
+  'fuchsia' => '#FF00FF',
+  'gainsboro' => '#DCDCDC',
+  'ghostwhite' => '#F8F8FF',
+  'gold' => '#FFD700',
+  'goldenrod' => '#DAA520',
   'gray' => '#808080',
+  'grey' => '#808080',
+  'green' => '#008000',
+  'greenyellow' => '#ADFF2F',
+  'honeydew' => '#F0FFF0',
+  'hotpink' => '#FF69B4',
+  'indianred' => '#CD5C5C',
+  'indigo' => '#4B0082',
+  'ivory' => '#FFFFF0',
+  'khaki' => '#F0E68C',
+  'lavender' => '#E6E6FA',
+  'lavenderblush' => '#FFF0F5',
+  'lawngreen' => '#7CFC00',
+  'lemonchiffon' => '#FFFACD',
+  'lightblue' => '#ADD8E6',
+  'lightcoral' => '#F08080',
+  'lightcyan' => '#E0FFFF',
+  'lightgoldenrodyellow' => '#FAFAD2',
+  'lightgray' => '#D3D3D3',
+  'lightgrey' => '#D3D3D3',
+  'lightgreen' => '#90EE90',
+  'lightpink' => '#FFB6C1',
+  'lightsalmon' => '#FFA07A',
+  'lightseagreen' => '#20B2AA',
+  'lightskyblue' => '#87CEFA',
+  'lightslategray' => '#778899',
+  'lightslategrey' => '#778899',
+  'lightsteelblue' => '#B0C4DE',
+  'lightyellow' => '#FFFFE0',
+  'lime' => '#00FF00',
+  'limegreen' => '#32CD32',
+  'linen' => '#FAF0E6',
+  'magenta' => '#FF00FF',
+  'maroon' => '#800000',
+  'mediumaquamarine' => '#66CDAA',
+  'mediumblue' => '#0000CD',
+  'mediumorchid' => '#BA55D3',
+  'mediumpurple' => '#9370DB',
+  'mediumseagreen' => '#3CB371',
+  'mediumslateblue' => '#7B68EE',
+  'mediumspringgreen' => '#00FA9A',
+  'mediumturquoise' => '#48D1CC',
+  'mediumvioletred' => '#C71585',
+  'midnightblue' => '#191970',
+  'mintcream' => '#F5FFFA',
+  'mistyrose' => '#FFE4E1',
+  'moccasin' => '#FFE4B5',
+  'navajowhite' => '#FFDEAD',
+  'navy' => '#000080',
+  'oldlace' => '#FDF5E6',
+  'olive' => '#808000',
+  'olivedrab' => '#6B8E23',
+  'orange' => '#FFA500',
+  'orangered' => '#FF4500',
+  'orchid' => '#DA70D6',
+  'palegoldenrod' => '#EEE8AA',
+  'palegreen' => '#98FB98',
+  'paleturquoise' => '#AFEEEE',
+  'palevioletred' => '#DB7093',
+  'papayawhip' => '#FFEFD5',
+  'peachpuff' => '#FFDAB9',
+  'peru' => '#CD853F',
+  'pink' => '#FFC0CB',
+  'plum' => '#DDA0DD',
+  'powderblue' => '#B0E0E6',
+  'purple' => '#800080',
+  'rebeccapurple' => '#663399',
+  'red' => '#FF0000',
+  'rosybrown' => '#BC8F8F',
+  'royalblue' => '#4169E1',
+  'saddlebrown' => '#8B4513',
+  'salmon' => '#FA8072',
+  'sandybrown' => '#F4A460',
+  'seagreen' => '#2E8B57',
+  'seashell' => '#FFF5EE',
+  'sienna' => '#A0522D',
+  'silver' => '#C0C0C0',
+  'skyblue' => '#87CEEB',
+  'slateblue' => '#6A5ACD',
+  'slategray' => '#708090',
+  'slategrey' => '#708090',
+  'snow' => '#FFFAFA',
+  'springgreen' => '#00FF7F',
+  'steelblue' => '#4682B4',
+  'tan' => '#D2B48C',
+  'teal' => '#008080',
+  'thistle' => '#D8BFD8',
+  'tomato' => '#FF6347',
+  'turquoise' => '#40E0D0',
+  'violet' => '#EE82EE',
+  'wheat' => '#F5DEB3',
+  'white' => '#FFFFFF',
+  'whitesmoke' => '#F5F5F5',
+  'yellow' => '#FFFF00',
+  'yellowgreen' => '#9ACD32'
 )
 --DESCRIPTION--
 
diff --git a/wire/modules/Markup/MarkupHTMLPurifier/htmlpurifier/standalone/HTMLPurifier/Language/messages/en-x-test.php b/wire/modules/Markup/MarkupHTMLPurifier/htmlpurifier/standalone/HTMLPurifier/Language/messages/en-x-test.php
index e6a174a0..83280543 100644
--- a/wire/modules/Markup/MarkupHTMLPurifier/htmlpurifier/standalone/HTMLPurifier/Language/messages/en-x-test.php
+++ b/wire/modules/Markup/MarkupHTMLPurifier/htmlpurifier/standalone/HTMLPurifier/Language/messages/en-x-test.php
@@ -8,4 +8,6 @@ $messages = array(
     'HTMLPurifier' => 'HTML Purifier X'
 );
 
+$errorNames = array();
+
 // vim: et sw=4 sts=4
diff --git a/wire/modules/Markup/MarkupHTMLPurifier/htmlpurifier/standalone/HTMLPurifier/Language/messages/en-x-testmini.php b/wire/modules/Markup/MarkupHTMLPurifier/htmlpurifier/standalone/HTMLPurifier/Language/messages/en-x-testmini.php
index ed8560fd..b6d1c99e 100644
--- a/wire/modules/Markup/MarkupHTMLPurifier/htmlpurifier/standalone/HTMLPurifier/Language/messages/en-x-testmini.php
+++ b/wire/modules/Markup/MarkupHTMLPurifier/htmlpurifier/standalone/HTMLPurifier/Language/messages/en-x-testmini.php
@@ -9,4 +9,6 @@ $messages = array(
     'HTMLPurifier' => 'HTML Purifier XNone'
 );
 
+$errorNames = array();
+
 // vim: et sw=4 sts=4
diff --git a/wire/modules/Markup/MarkupHTMLPurifier/htmlpurifier/standalone/HTMLPurifier/Lexer/PH5P.php b/wire/modules/Markup/MarkupHTMLPurifier/htmlpurifier/standalone/HTMLPurifier/Lexer/PH5P.php
index b084ee96..6b281a54 100644
--- a/wire/modules/Markup/MarkupHTMLPurifier/htmlpurifier/standalone/HTMLPurifier/Lexer/PH5P.php
+++ b/wire/modules/Markup/MarkupHTMLPurifier/htmlpurifier/standalone/HTMLPurifier/Lexer/PH5P.php
@@ -1507,7 +1507,7 @@ class HTML5
                 $entity = $this->character($start, $this->char);
                 $cond = strlen($e_name) > 0;
 
-                // The rest of the parsing happens bellow.
+                // The rest of the parsing happens below.
                 break;
 
             // Anything else
@@ -1535,7 +1535,7 @@ class HTML5
                 }
 
                 $cond = isset($entity);
-                // The rest of the parsing happens bellow.
+                // The rest of the parsing happens below.
                 break;
         }
 
diff --git a/wire/modules/Markup/MarkupHTMLPurifier/htmlpurifier/standalone/HTMLPurifier/Printer/ConfigForm.min.js b/wire/modules/Markup/MarkupHTMLPurifier/htmlpurifier/standalone/HTMLPurifier/Printer/ConfigForm.min.js
deleted file mode 100644
index c9bc8b4b..00000000
--- a/wire/modules/Markup/MarkupHTMLPurifier/htmlpurifier/standalone/HTMLPurifier/Printer/ConfigForm.min.js
+++ /dev/null
@@ -1 +0,0 @@
-function toggleWriteability(a,b){document.getElementById(a).disabled=b};
\ No newline at end of file
diff --git a/wire/modules/Markup/MarkupHTMLPurifier/htmlpurifier/standalone/HTMLPurifier/Printer/ConfigForm.php b/wire/modules/Markup/MarkupHTMLPurifier/htmlpurifier/standalone/HTMLPurifier/Printer/ConfigForm.php
index 3bc41736..8897002e 100644
--- a/wire/modules/Markup/MarkupHTMLPurifier/htmlpurifier/standalone/HTMLPurifier/Printer/ConfigForm.php
+++ b/wire/modules/Markup/MarkupHTMLPurifier/htmlpurifier/standalone/HTMLPurifier/Printer/ConfigForm.php
@@ -48,7 +48,7 @@ class HTMLPurifier_Printer_ConfigForm extends HTMLPurifier_Printer
         $this->compress = $compress;
         // initialize sub-printers
         $this->fields[0] = new HTMLPurifier_Printer_ConfigForm_default();
-        $this->fields[HTMLPurifier_VarParser::BOOL] = new HTMLPurifier_Printer_ConfigForm_bool();
+        $this->fields[HTMLPurifier_VarParser::C_BOOL] = new HTMLPurifier_Printer_ConfigForm_bool();
     }
 
     /**
@@ -339,7 +339,7 @@ class HTMLPurifier_Printer_ConfigForm_default extends HTMLPurifier_Printer
                     $value = '';
             }
         }
-        if ($type === HTMLPurifier_VarParser::MIXED) {
+        if ($type === HTMLPurifier_VarParser::C_MIXED) {
             return 'Not supported';
             $value = serialize($value);
         }