From 71e9c6114eb815d787c7c3f6dcca5048de287d3a Mon Sep 17 00:00:00 2001 From: Ryan Cramer Date: Tue, 3 Dec 2019 10:42:17 -0500 Subject: [PATCH] Update HTMLPurifier version to 4.12.0 --- .../htmlpurifier/HTMLPurifier.standalone.php | 865 +++++++++--------- 1 file changed, 435 insertions(+), 430 deletions(-) diff --git a/wire/modules/Markup/MarkupHTMLPurifier/htmlpurifier/HTMLPurifier.standalone.php b/wire/modules/Markup/MarkupHTMLPurifier/htmlpurifier/HTMLPurifier.standalone.php index 23094267..cfdbcc92 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.11.0 + * @version 4.12.0 * * @warning * You must *not* include any other HTML Purifier files before this file, @@ -39,7 +39,7 @@ */ /* - HTML Purifier 4.11.0 - Standards Compliant HTML Filtering + HTML Purifier 4.12.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.11.0'; + public $version = '4.12.0'; /** * Constant with version of HTML Purifier. */ - const VERSION = '4.11.0'; + const VERSION = '4.12.0'; /** * Global configuration object. @@ -313,8 +313,8 @@ class HTMLPurifier } } - - + + /** @@ -386,7 +386,7 @@ class HTMLPurifier_Arborize return $tokens; } } - + /** @@ -534,8 +534,8 @@ class HTMLPurifier_AttrCollections } } - - + + /** @@ -679,8 +679,8 @@ abstract class HTMLPurifier_AttrDef } } - - + + /** @@ -740,8 +740,8 @@ abstract class HTMLPurifier_AttrTransform } } - - + + /** @@ -837,8 +837,8 @@ class HTMLPurifier_AttrTypes } } - - + + /** @@ -1016,8 +1016,8 @@ class HTMLPurifier_AttrValidator } - - + + // constants are slow, so we use as few as possible @@ -1142,8 +1142,8 @@ class HTMLPurifier_Bootstrap } } - - + + /** @@ -1198,8 +1198,8 @@ abstract class HTMLPurifier_Definition } } - - + + /** @@ -1732,8 +1732,8 @@ class HTMLPurifier_CSSDefinition extends HTMLPurifier_Definition } } - - + + /** @@ -1785,8 +1785,8 @@ abstract class HTMLPurifier_ChildDef abstract public function validateChildren($children, $config, $context); } - - + + /** @@ -1810,7 +1810,7 @@ class HTMLPurifier_Config * HTML Purifier's version * @type string */ - public $version = '4.11.0'; + public $version = '4.12.0'; /** * Whether or not to automatically finalize @@ -2706,8 +2706,8 @@ class HTMLPurifier_Config } - - + + /** @@ -2883,8 +2883,8 @@ class HTMLPurifier_ConfigSchema } } - - + + /** @@ -3054,8 +3054,8 @@ class HTMLPurifier_ContentSets } } - - + + /** @@ -3150,8 +3150,8 @@ class HTMLPurifier_Context } } - - + + /** @@ -3280,8 +3280,8 @@ abstract class HTMLPurifier_DefinitionCache abstract public function cleanup($config); } - - + + /** @@ -3387,8 +3387,8 @@ class HTMLPurifier_DefinitionCacheFactory } } - - + + /** @@ -3461,8 +3461,8 @@ class HTMLPurifier_Doctype } } - - + + class HTMLPurifier_DoctypeRegistry @@ -3604,8 +3604,8 @@ class HTMLPurifier_DoctypeRegistry } } - - + + /** @@ -3821,8 +3821,8 @@ class HTMLPurifier_ElementDef } } - - + + /** @@ -3984,7 +3984,7 @@ class HTMLPurifier_Encoder $len = strlen($str); for ($i = 0; $i < $len; $i++) { - $in = ord($str{$i}); + $in = ord($str[$i]); $char .= $str[$i]; // append byte to char if (0 == $mState) { // When mState is zero we expect either a US-ASCII character @@ -4439,8 +4439,8 @@ class HTMLPurifier_Encoder } } - - + + /** @@ -4488,8 +4488,8 @@ class HTMLPurifier_EntityLookup } } - - + + // if want to implement error collecting here, we'll need to use some sort @@ -4774,8 +4774,8 @@ class HTMLPurifier_EntityParser } } - - + + /** @@ -5019,8 +5019,8 @@ class HTMLPurifier_ErrorCollector } } - - + + /** @@ -5094,8 +5094,8 @@ class HTMLPurifier_ErrorStruct } } - - + + /** @@ -5107,8 +5107,8 @@ class HTMLPurifier_Exception extends Exception } - - + + /** @@ -5164,8 +5164,8 @@ class HTMLPurifier_Filter } } - - + + /** @@ -5451,8 +5451,8 @@ class HTMLPurifier_Generator } } - - + + /** @@ -5945,8 +5945,8 @@ class HTMLPurifier_HTMLDefinition extends HTMLPurifier_Definition } } - - + + /** @@ -6081,9 +6081,9 @@ class HTMLPurifier_HTMLModule * @param string $element Name of element to add * @param string|bool $type What content set should element be registered to? * Set as false to skip this step. - * @param string $contents Allowed children in form of: + * @param string|HTMLPurifier_ChildDef $contents Allowed children in form of: * "$content_model_type: $content_model" - * @param array $attr_includes What attribute collections to register to + * @param array|string $attr_includes What attribute collections to register to * element? * @param array $attr What unique attributes does the element define? * @see HTMLPurifier_ElementDef:: for in-depth descriptions of these parameters. @@ -6230,8 +6230,8 @@ class HTMLPurifier_HTMLModule } } - - + + class HTMLPurifier_HTMLModuleManager @@ -6698,8 +6698,8 @@ class HTMLPurifier_HTMLModuleManager } } - - + + /** @@ -6756,8 +6756,8 @@ class HTMLPurifier_IDAccumulator } } - - + + /** @@ -7040,8 +7040,8 @@ abstract class HTMLPurifier_Injector } } - - + + /** @@ -7245,8 +7245,8 @@ class HTMLPurifier_Language } } - - + + /** @@ -7455,8 +7455,8 @@ class HTMLPurifier_LanguageFactory } } - - + + /** @@ -7618,8 +7618,8 @@ class HTMLPurifier_Length } } - - + + /** @@ -8001,8 +8001,8 @@ class HTMLPurifier_Lexer } } - - + + /** @@ -8051,8 +8051,8 @@ abstract class HTMLPurifier_Node abstract public function toTokenPair(); } - - + + /** @@ -8163,8 +8163,8 @@ class HTMLPurifier_PercentEncoder } } - - + + /** @@ -8286,8 +8286,8 @@ class HTMLPurifier_PropertyList } } - - + + /** @@ -8329,8 +8329,8 @@ class HTMLPurifier_PropertyListIterator extends FilterIterator } } - - + + /** @@ -8387,7 +8387,7 @@ class HTMLPurifier_Queue { return empty($this->input) && empty($this->output); } } - + /** @@ -8413,8 +8413,8 @@ abstract class HTMLPurifier_Strategy abstract public function execute($tokens, $config, $context); } - - + + /** @@ -8461,8 +8461,8 @@ class HTMLPurifier_StringHash extends ArrayObject } } - - + + /** @@ -8598,8 +8598,8 @@ class HTMLPurifier_StringHashParser } } - - + + /** @@ -8636,8 +8636,8 @@ abstract class HTMLPurifier_TagTransform } } - - + + /** @@ -8737,8 +8737,8 @@ abstract class HTMLPurifier_Token abstract public function toNode(); } - - + + /** @@ -8856,8 +8856,8 @@ class HTMLPurifier_TokenFactory } } - - + + /** @@ -9173,8 +9173,8 @@ class HTMLPurifier_URI } } - - + + class HTMLPurifier_URIDefinition extends HTMLPurifier_Definition @@ -9286,8 +9286,8 @@ class HTMLPurifier_URIDefinition extends HTMLPurifier_Definition } - - + + /** @@ -9361,8 +9361,8 @@ abstract class HTMLPurifier_URIFilter abstract public function filter(&$uri, $config, $context); } - - + + /** @@ -9433,8 +9433,8 @@ class HTMLPurifier_URIParser } - - + + /** @@ -9536,8 +9536,8 @@ abstract class HTMLPurifier_URIScheme } } - - + + /** @@ -9618,8 +9618,8 @@ class HTMLPurifier_URISchemeRegistry } } - - + + /** @@ -9926,8 +9926,8 @@ class HTMLPurifier_UnitConverter } } - - + + /** @@ -10125,8 +10125,8 @@ class HTMLPurifier_VarParser } } - - + + /** @@ -10137,8 +10137,8 @@ class HTMLPurifier_VarParserException extends HTMLPurifier_Exception } - - + + /** @@ -10296,7 +10296,7 @@ class HTMLPurifier_Zipper return array($old, $r); } } - + /** @@ -10432,8 +10432,8 @@ class HTMLPurifier_AttrDef_CSS extends HTMLPurifier_AttrDef } - - + + /** @@ -10477,8 +10477,8 @@ class HTMLPurifier_AttrDef_Clone extends HTMLPurifier_AttrDef } } - - + + // Enum = Enumerated @@ -10551,8 +10551,8 @@ class HTMLPurifier_AttrDef_Enum extends HTMLPurifier_AttrDef } } - - + + /** @@ -10643,8 +10643,8 @@ class HTMLPurifier_AttrDef_Integer extends HTMLPurifier_AttrDef } } - - + + /** @@ -10730,8 +10730,8 @@ class HTMLPurifier_AttrDef_Lang extends HTMLPurifier_AttrDef } } - - + + /** @@ -10784,8 +10784,8 @@ class HTMLPurifier_AttrDef_Switch } } - - + + /** @@ -10806,8 +10806,8 @@ class HTMLPurifier_AttrDef_Text extends HTMLPurifier_AttrDef } } - - + + /** @@ -10918,8 +10918,8 @@ class HTMLPurifier_AttrDef_URI extends HTMLPurifier_AttrDef } } - - + + /** @@ -11003,8 +11003,8 @@ class HTMLPurifier_AttrDef_CSS_Number extends HTMLPurifier_AttrDef } } - - + + class HTMLPurifier_AttrDef_CSS_AlphaValue extends HTMLPurifier_AttrDef_CSS_Number @@ -11038,8 +11038,8 @@ class HTMLPurifier_AttrDef_CSS_AlphaValue extends HTMLPurifier_AttrDef_CSS_Numbe } } - - + + /** @@ -11150,8 +11150,8 @@ class HTMLPurifier_AttrDef_CSS_Background extends HTMLPurifier_AttrDef } } - - + + /* W3C says: @@ -11308,8 +11308,8 @@ class HTMLPurifier_AttrDef_CSS_BackgroundPosition extends HTMLPurifier_AttrDef } } - - + + /** @@ -11365,8 +11365,8 @@ class HTMLPurifier_AttrDef_CSS_Border extends HTMLPurifier_AttrDef } } - - + + /** @@ -11527,8 +11527,8 @@ class HTMLPurifier_AttrDef_CSS_Color extends HTMLPurifier_AttrDef } - - + + /** @@ -11576,8 +11576,8 @@ class HTMLPurifier_AttrDef_CSS_Composite extends HTMLPurifier_AttrDef } } - - + + /** @@ -11621,8 +11621,8 @@ class HTMLPurifier_AttrDef_CSS_DenyElementDecorator extends HTMLPurifier_AttrDef } } - - + + /** @@ -11699,8 +11699,8 @@ class HTMLPurifier_AttrDef_CSS_Filter extends HTMLPurifier_AttrDef } } - - + + /** @@ -11876,8 +11876,8 @@ class HTMLPurifier_AttrDef_CSS_Font extends HTMLPurifier_AttrDef } } - - + + /** @@ -12096,8 +12096,8 @@ class HTMLPurifier_AttrDef_CSS_FontFamily extends HTMLPurifier_AttrDef } - - + + /** @@ -12129,8 +12129,8 @@ class HTMLPurifier_AttrDef_CSS_Ident extends HTMLPurifier_AttrDef } } - - + + /** @@ -12186,8 +12186,8 @@ class HTMLPurifier_AttrDef_CSS_ImportantDecorator extends HTMLPurifier_AttrDef } } - - + + /** @@ -12264,8 +12264,8 @@ class HTMLPurifier_AttrDef_CSS_Length extends HTMLPurifier_AttrDef } } - - + + /** @@ -12377,8 +12377,8 @@ class HTMLPurifier_AttrDef_CSS_ListStyle extends HTMLPurifier_AttrDef } } - - + + /** @@ -12449,8 +12449,8 @@ class HTMLPurifier_AttrDef_CSS_Multiple extends HTMLPurifier_AttrDef } } - - + + /** @@ -12504,8 +12504,8 @@ class HTMLPurifier_AttrDef_CSS_Percentage extends HTMLPurifier_AttrDef } } - - + + /** @@ -12551,8 +12551,8 @@ class HTMLPurifier_AttrDef_CSS_TextDecoration extends HTMLPurifier_AttrDef } } - - + + /** @@ -12629,8 +12629,8 @@ class HTMLPurifier_AttrDef_CSS_URI extends HTMLPurifier_AttrDef_URI } } - - + + /** @@ -12640,7 +12640,7 @@ class HTMLPurifier_AttrDef_HTML_Bool extends HTMLPurifier_AttrDef { /** - * @type bool + * @type string */ protected $name; @@ -12650,7 +12650,7 @@ class HTMLPurifier_AttrDef_HTML_Bool extends HTMLPurifier_AttrDef public $minimized = true; /** - * @param bool $name + * @param bool|string $name */ public function __construct($name = false) { @@ -12678,8 +12678,8 @@ class HTMLPurifier_AttrDef_HTML_Bool extends HTMLPurifier_AttrDef } } - - + + /** @@ -12749,8 +12749,8 @@ class HTMLPurifier_AttrDef_HTML_Nmtokens extends HTMLPurifier_AttrDef } } - - + + /** @@ -12799,7 +12799,7 @@ class HTMLPurifier_AttrDef_HTML_Class extends HTMLPurifier_AttrDef_HTML_Nmtokens return $ret; } } - + /** @@ -12850,8 +12850,8 @@ class HTMLPurifier_AttrDef_HTML_Color extends HTMLPurifier_AttrDef } } - - + + /** @@ -12889,8 +12889,8 @@ class HTMLPurifier_AttrDef_HTML_FrameTarget extends HTMLPurifier_AttrDef_Enum } } - - + + /** @@ -13003,8 +13003,8 @@ class HTMLPurifier_AttrDef_HTML_ID extends HTMLPurifier_AttrDef } } - - + + /** @@ -13080,8 +13080,8 @@ class HTMLPurifier_AttrDef_HTML_Pixels extends HTMLPurifier_AttrDef } } - - + + /** @@ -13137,8 +13137,8 @@ class HTMLPurifier_AttrDef_HTML_Length extends HTMLPurifier_AttrDef_HTML_Pixels } } - - + + /** @@ -13210,8 +13210,8 @@ class HTMLPurifier_AttrDef_HTML_LinkTypes extends HTMLPurifier_AttrDef } } - - + + /** @@ -13271,8 +13271,8 @@ class HTMLPurifier_AttrDef_HTML_MultiLength extends HTMLPurifier_AttrDef_HTML_Le } } - - + + abstract class HTMLPurifier_AttrDef_URI_Email extends HTMLPurifier_AttrDef @@ -13292,8 +13292,8 @@ abstract class HTMLPurifier_AttrDef_URI_Email extends HTMLPurifier_AttrDef // sub-implementations - - + + /** @@ -13435,8 +13435,8 @@ class HTMLPurifier_AttrDef_URI_Host extends HTMLPurifier_AttrDef } } - - + + /** @@ -13481,8 +13481,8 @@ class HTMLPurifier_AttrDef_URI_IPv4 extends HTMLPurifier_AttrDef } } - - + + /** @@ -13571,8 +13571,8 @@ class HTMLPurifier_AttrDef_URI_IPv6 extends HTMLPurifier_AttrDef_URI_IPv4 } } - - + + /** @@ -13601,8 +13601,8 @@ class HTMLPurifier_AttrDef_URI_Email_SimpleCheck extends HTMLPurifier_AttrDef_UR } } - - + + /** @@ -13630,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 @@ -13658,8 +13658,8 @@ class HTMLPurifier_AttrTransform_BdoDir extends HTMLPurifier_AttrTransform } } - - + + /** @@ -13687,8 +13687,8 @@ class HTMLPurifier_AttrTransform_BgColor extends HTMLPurifier_AttrTransform } } - - + + /** @@ -13735,8 +13735,8 @@ class HTMLPurifier_AttrTransform_BoolToCSS extends HTMLPurifier_AttrTransform } } - - + + /** @@ -13762,8 +13762,8 @@ class HTMLPurifier_AttrTransform_Border extends HTMLPurifier_AttrTransform } } - - + + /** @@ -13831,8 +13831,8 @@ class HTMLPurifier_AttrTransform_EnumToCSS extends HTMLPurifier_AttrTransform } } - - + + // must be called POST validation @@ -13879,8 +13879,8 @@ class HTMLPurifier_AttrTransform_ImgRequired extends HTMLPurifier_AttrTransform } } - - + + /** @@ -13941,8 +13941,8 @@ class HTMLPurifier_AttrTransform_ImgSpace extends HTMLPurifier_AttrTransform } } - - + + /** @@ -13998,8 +13998,8 @@ class HTMLPurifier_AttrTransform_Input extends HTMLPurifier_AttrTransform } } - - + + /** @@ -14030,8 +14030,8 @@ class HTMLPurifier_AttrTransform_Lang extends HTMLPurifier_AttrTransform } } - - + + /** @@ -14076,8 +14076,8 @@ class HTMLPurifier_AttrTransform_Length extends HTMLPurifier_AttrTransform } } - - + + /** @@ -14110,8 +14110,8 @@ class HTMLPurifier_AttrTransform_Name extends HTMLPurifier_AttrTransform } } - - + + /** @@ -14152,8 +14152,8 @@ class HTMLPurifier_AttrTransform_NameSync extends HTMLPurifier_AttrTransform } } - - + + // must be called POST validation @@ -14205,8 +14205,8 @@ class HTMLPurifier_AttrTransform_Nofollow extends HTMLPurifier_AttrTransform } } - - + + class HTMLPurifier_AttrTransform_SafeEmbed extends HTMLPurifier_AttrTransform @@ -14231,8 +14231,8 @@ class HTMLPurifier_AttrTransform_SafeEmbed extends HTMLPurifier_AttrTransform } } - - + + /** @@ -14260,8 +14260,8 @@ class HTMLPurifier_AttrTransform_SafeObject extends HTMLPurifier_AttrTransform } } - - + + /** @@ -14340,8 +14340,8 @@ class HTMLPurifier_AttrTransform_SafeParam extends HTMLPurifier_AttrTransform } } - - + + /** @@ -14364,8 +14364,8 @@ class HTMLPurifier_AttrTransform_ScriptRequired extends HTMLPurifier_AttrTransfo } } - - + + // must be called POST validation @@ -14410,8 +14410,8 @@ class HTMLPurifier_AttrTransform_TargetBlank extends HTMLPurifier_AttrTransform } } - - + + // must be called POST validation @@ -14449,7 +14449,7 @@ class HTMLPurifier_AttrTransform_TargetNoopener extends HTMLPurifier_AttrTransfo } } - + // must be called POST validation @@ -14487,7 +14487,7 @@ class HTMLPurifier_AttrTransform_TargetNoreferrer extends HTMLPurifier_AttrTrans } } - + /** @@ -14514,8 +14514,8 @@ class HTMLPurifier_AttrTransform_Textarea extends HTMLPurifier_AttrTransform } } - - + + /** @@ -14582,8 +14582,8 @@ class HTMLPurifier_ChildDef_Chameleon extends HTMLPurifier_ChildDef } } - - + + /** @@ -14631,7 +14631,7 @@ class HTMLPurifier_ChildDef_Custom extends HTMLPurifier_ChildDef protected function _compileRegex() { $raw = str_replace(' ', '', $this->dtd_regex); - if ($raw{0} != '(') { + if ($raw[0] != '(') { $raw = "($raw)"; } $el = '[#a-zA-Z0-9_.-]+'; @@ -14685,8 +14685,8 @@ class HTMLPurifier_ChildDef_Custom extends HTMLPurifier_ChildDef } } - - + + /** @@ -14724,8 +14724,8 @@ class HTMLPurifier_ChildDef_Empty extends HTMLPurifier_ChildDef } } - - + + /** @@ -14817,8 +14817,8 @@ class HTMLPurifier_ChildDef_List extends HTMLPurifier_ChildDef } } - - + + /** @@ -14936,8 +14936,8 @@ class HTMLPurifier_ChildDef_Required extends HTMLPurifier_ChildDef } } - - + + /** @@ -14982,8 +14982,8 @@ class HTMLPurifier_ChildDef_Optional extends HTMLPurifier_ChildDef_Required } } - - + + /** @@ -15093,8 +15093,8 @@ class HTMLPurifier_ChildDef_StrictBlockquote extends HTMLPurifier_ChildDef_Requi } } - - + + /** @@ -15318,8 +15318,8 @@ class HTMLPurifier_ChildDef_Table extends HTMLPurifier_ChildDef } } - - + + class HTMLPurifier_DefinitionCache_Decorator extends HTMLPurifier_DefinitionCache @@ -15431,8 +15431,8 @@ class HTMLPurifier_DefinitionCache_Decorator extends HTMLPurifier_DefinitionCach } } - - + + /** @@ -15508,8 +15508,8 @@ class HTMLPurifier_DefinitionCache_Null extends HTMLPurifier_DefinitionCache } } - - + + class HTMLPurifier_DefinitionCache_Serializer extends HTMLPurifier_DefinitionCache @@ -15820,8 +15820,8 @@ class HTMLPurifier_DefinitionCache_Serializer extends HTMLPurifier_DefinitionCac } } - - + + /** @@ -15899,8 +15899,8 @@ class HTMLPurifier_DefinitionCache_Decorator_Cleanup extends HTMLPurifier_Defini } } - - + + /** @@ -15985,8 +15985,8 @@ class HTMLPurifier_DefinitionCache_Decorator_Memory extends HTMLPurifier_Definit } } - - + + /** @@ -16030,8 +16030,8 @@ class HTMLPurifier_HTMLModule_Bdo extends HTMLPurifier_HTMLModule } } - - + + class HTMLPurifier_HTMLModule_CommonAttributes extends HTMLPurifier_HTMLModule @@ -16062,8 +16062,8 @@ class HTMLPurifier_HTMLModule_CommonAttributes extends HTMLPurifier_HTMLModule ); } - - + + /** @@ -16118,8 +16118,8 @@ class HTMLPurifier_HTMLModule_Edit extends HTMLPurifier_HTMLModule } } - - + + /** @@ -16309,8 +16309,8 @@ class HTMLPurifier_HTMLModule_Forms extends HTMLPurifier_HTMLModule } } - - + + /** @@ -16350,8 +16350,8 @@ class HTMLPurifier_HTMLModule_Hypertext extends HTMLPurifier_HTMLModule } } - - + + /** @@ -16402,8 +16402,8 @@ class HTMLPurifier_HTMLModule_Iframe extends HTMLPurifier_HTMLModule } } - - + + /** @@ -16452,8 +16452,8 @@ class HTMLPurifier_HTMLModule_Image extends HTMLPurifier_HTMLModule } } - - + + /** @@ -16639,8 +16639,8 @@ class HTMLPurifier_HTMLModule_Legacy extends HTMLPurifier_HTMLModule } } - - + + /** @@ -16691,8 +16691,8 @@ class HTMLPurifier_HTMLModule_List extends HTMLPurifier_HTMLModule } } - - + + class HTMLPurifier_HTMLModule_Name extends HTMLPurifier_HTMLModule @@ -16718,8 +16718,8 @@ class HTMLPurifier_HTMLModule_Name extends HTMLPurifier_HTMLModule } } - - + + /** @@ -16744,8 +16744,8 @@ class HTMLPurifier_HTMLModule_Nofollow extends HTMLPurifier_HTMLModule } } - - + + class HTMLPurifier_HTMLModule_NonXMLCommonAttributes extends HTMLPurifier_HTMLModule @@ -16765,8 +16765,8 @@ class HTMLPurifier_HTMLModule_NonXMLCommonAttributes extends HTMLPurifier_HTMLMo ); } - - + + /** @@ -16828,8 +16828,8 @@ class HTMLPurifier_HTMLModule_Object extends HTMLPurifier_HTMLModule } } - - + + /** @@ -16871,8 +16871,8 @@ class HTMLPurifier_HTMLModule_Presentation extends HTMLPurifier_HTMLModule } } - - + + /** @@ -16912,8 +16912,8 @@ class HTMLPurifier_HTMLModule_Proprietary extends HTMLPurifier_HTMLModule } } - - + + /** @@ -16949,8 +16949,8 @@ class HTMLPurifier_HTMLModule_Ruby extends HTMLPurifier_HTMLModule } } - - + + /** @@ -16990,8 +16990,8 @@ class HTMLPurifier_HTMLModule_SafeEmbed extends HTMLPurifier_HTMLModule } } - - + + /** @@ -17053,8 +17053,8 @@ class HTMLPurifier_HTMLModule_SafeObject extends HTMLPurifier_HTMLModule } } - - + + /** @@ -17094,8 +17094,8 @@ class HTMLPurifier_HTMLModule_SafeScripting extends HTMLPurifier_HTMLModule } } - - + + /* @@ -17168,8 +17168,8 @@ class HTMLPurifier_HTMLModule_Scripting extends HTMLPurifier_HTMLModule } } - - + + /** @@ -17202,8 +17202,8 @@ class HTMLPurifier_HTMLModule_StyleAttribute extends HTMLPurifier_HTMLModule } } - - + + /** @@ -17278,8 +17278,8 @@ class HTMLPurifier_HTMLModule_Tables extends HTMLPurifier_HTMLModule } } - - + + /** @@ -17307,8 +17307,8 @@ class HTMLPurifier_HTMLModule_Target extends HTMLPurifier_HTMLModule } } - - + + /** @@ -17332,8 +17332,8 @@ class HTMLPurifier_HTMLModule_TargetBlank extends HTMLPurifier_HTMLModule } } - - + + /** @@ -17355,7 +17355,7 @@ class HTMLPurifier_HTMLModule_TargetNoopener extends HTMLPurifier_HTMLModule $a->attr_transform_post[] = new HTMLPurifier_AttrTransform_TargetNoopener(); } } - + /** @@ -17377,7 +17377,7 @@ class HTMLPurifier_HTMLModule_TargetNoreferrer extends HTMLPurifier_HTMLModule $a->attr_transform_post[] = new HTMLPurifier_AttrTransform_TargetNoreferrer(); } } - + /** @@ -17464,8 +17464,8 @@ class HTMLPurifier_HTMLModule_Text extends HTMLPurifier_HTMLModule } } - - + + /** @@ -17695,8 +17695,8 @@ class HTMLPurifier_HTMLModule_Tidy extends HTMLPurifier_HTMLModule } } - - + + class HTMLPurifier_HTMLModule_XMLCommonAttributes extends HTMLPurifier_HTMLModule @@ -17716,8 +17716,8 @@ class HTMLPurifier_HTMLModule_XMLCommonAttributes extends HTMLPurifier_HTMLModul ); } - - + + /** @@ -17750,8 +17750,8 @@ class HTMLPurifier_HTMLModule_Tidy_Name extends HTMLPurifier_HTMLModule_Tidy } } - - + + class HTMLPurifier_HTMLModule_Tidy_Proprietary extends HTMLPurifier_HTMLModule_Tidy @@ -17785,8 +17785,8 @@ class HTMLPurifier_HTMLModule_Tidy_Proprietary extends HTMLPurifier_HTMLModule_T } } - - + + class HTMLPurifier_HTMLModule_Tidy_XHTMLAndHTML4 extends HTMLPurifier_HTMLModule_Tidy @@ -17965,8 +17965,8 @@ class HTMLPurifier_HTMLModule_Tidy_XHTMLAndHTML4 extends HTMLPurifier_HTMLModule } } - - + + class HTMLPurifier_HTMLModule_Tidy_Strict extends HTMLPurifier_HTMLModule_Tidy_XHTMLAndHTML4 @@ -18009,8 +18009,8 @@ class HTMLPurifier_HTMLModule_Tidy_Strict extends HTMLPurifier_HTMLModule_Tidy_X } } - - + + class HTMLPurifier_HTMLModule_Tidy_Transitional extends HTMLPurifier_HTMLModule_Tidy_XHTMLAndHTML4 @@ -18026,8 +18026,8 @@ class HTMLPurifier_HTMLModule_Tidy_Transitional extends HTMLPurifier_HTMLModule_ public $defaultLevel = 'heavy'; } - - + + class HTMLPurifier_HTMLModule_Tidy_XHTML extends HTMLPurifier_HTMLModule_Tidy @@ -18053,8 +18053,8 @@ class HTMLPurifier_HTMLModule_Tidy_XHTML extends HTMLPurifier_HTMLModule_Tidy } } - - + + /** @@ -18410,8 +18410,8 @@ class HTMLPurifier_Injector_AutoParagraph extends HTMLPurifier_Injector } } - - + + /** @@ -18451,8 +18451,8 @@ class HTMLPurifier_Injector_DisplayLinkURI extends HTMLPurifier_Injector } } - - + + /** @@ -18516,8 +18516,8 @@ class HTMLPurifier_Injector_Linkify extends HTMLPurifier_Injector } } - - + + /** @@ -18588,8 +18588,8 @@ class HTMLPurifier_Injector_PurifierLinkify extends HTMLPurifier_Injector } } - - + + class HTMLPurifier_Injector_RemoveEmpty extends HTMLPurifier_Injector @@ -18701,8 +18701,8 @@ class HTMLPurifier_Injector_RemoveEmpty extends HTMLPurifier_Injector } } - - + + /** @@ -18786,8 +18786,8 @@ class HTMLPurifier_Injector_RemoveSpansWithoutAttributes extends HTMLPurifier_In } } - - + + /** @@ -18911,8 +18911,8 @@ class HTMLPurifier_Injector_SafeObject extends HTMLPurifier_Injector } } - - + + /** @@ -18989,7 +18989,12 @@ class HTMLPurifier_Lexer_DOMLex extends HTMLPurifier_Lexer } set_error_handler(array($this, 'muteErrorHandler')); - $doc->loadHTML($html, $options); + // loadHTML() fails on PHP 5.3 when second parameter is given + if ($options) { + $doc->loadHTML($html, $options); + } else { + $doc->loadHTML($html); + } restore_error_handler(); $body = $doc->getElementsByTagName('html')->item(0)-> // @@ -19245,8 +19250,8 @@ class HTMLPurifier_Lexer_DOMLex extends HTMLPurifier_Lexer } } - - + + /** @@ -19785,8 +19790,8 @@ class HTMLPurifier_Lexer_DirectLex extends HTMLPurifier_Lexer } } - - + + /** @@ -19823,7 +19828,7 @@ class HTMLPurifier_Node_Comment extends HTMLPurifier_Node return array(new HTMLPurifier_Token_Comment($this->data, $this->line, $this->col), null); } } - + /** @@ -19883,7 +19888,7 @@ class HTMLPurifier_Node_Element extends HTMLPurifier_Node } } - + /** @@ -19937,8 +19942,8 @@ class HTMLPurifier_Node_Text extends HTMLPurifier_Node } } - - + + /** @@ -19968,8 +19973,8 @@ abstract class HTMLPurifier_Strategy_Composite extends HTMLPurifier_Strategy } } - - + + /** @@ -19986,8 +19991,8 @@ class HTMLPurifier_Strategy_Core extends HTMLPurifier_Strategy_Composite } } - - + + /** @@ -20168,8 +20173,8 @@ class HTMLPurifier_Strategy_FixNesting extends HTMLPurifier_Strategy } } - - + + /** @@ -20828,8 +20833,8 @@ class HTMLPurifier_Strategy_MakeWellFormed extends HTMLPurifier_Strategy // defined, and in any case you probably wanted to operate on trees, // not token streams. - - + + /** @@ -21036,8 +21041,8 @@ class HTMLPurifier_Strategy_RemoveForeignElements extends HTMLPurifier_Strategy } } - - + + /** @@ -21082,8 +21087,8 @@ class HTMLPurifier_Strategy_ValidateAttributes extends HTMLPurifier_Strategy } } - - + + /** @@ -21161,7 +21166,7 @@ class HTMLPurifier_TagTransform_Font extends HTMLPurifier_TagTransform if (isset($attr['size'])) { // normalize large numbers if ($attr['size'] !== '') { - if ($attr['size']{0} == '+' || $attr['size']{0} == '-') { + if ($attr['size'][0] == '+' || $attr['size'][0] == '-') { $size = (int)$attr['size']; if ($size < -2) { $attr['size'] = '-2'; @@ -21197,8 +21202,8 @@ class HTMLPurifier_TagTransform_Font extends HTMLPurifier_TagTransform } } - - + + /** @@ -21242,8 +21247,8 @@ class HTMLPurifier_TagTransform_Simple extends HTMLPurifier_TagTransform } } - - + + /** @@ -21281,8 +21286,8 @@ class HTMLPurifier_Token_Comment extends HTMLPurifier_Token } } - - + + /** @@ -21350,8 +21355,8 @@ abstract class HTMLPurifier_Token_Tag extends HTMLPurifier_Token } } - - + + /** @@ -21366,8 +21371,8 @@ class HTMLPurifier_Token_Empty extends HTMLPurifier_Token_Tag } } - - + + /** @@ -21391,8 +21396,8 @@ class HTMLPurifier_Token_End extends HTMLPurifier_Token_Tag } } - - + + /** @@ -21402,8 +21407,8 @@ class HTMLPurifier_Token_Start extends HTMLPurifier_Token_Tag { } - - + + /** @@ -21456,8 +21461,8 @@ class HTMLPurifier_Token_Text extends HTMLPurifier_Token } } - - + + class HTMLPurifier_URIFilter_DisableExternal extends HTMLPurifier_URIFilter @@ -21511,8 +21516,8 @@ class HTMLPurifier_URIFilter_DisableExternal extends HTMLPurifier_URIFilter } } - - + + class HTMLPurifier_URIFilter_DisableExternalResources extends HTMLPurifier_URIFilter_DisableExternal @@ -21537,8 +21542,8 @@ class HTMLPurifier_URIFilter_DisableExternalResources extends HTMLPurifier_URIFi } } - - + + class HTMLPurifier_URIFilter_DisableResources extends HTMLPurifier_URIFilter @@ -21560,8 +21565,8 @@ class HTMLPurifier_URIFilter_DisableResources extends HTMLPurifier_URIFilter } } - - + + // It's not clear to me whether or not Punycode means that hostnames @@ -21607,8 +21612,8 @@ class HTMLPurifier_URIFilter_HostBlacklist extends HTMLPurifier_URIFilter } } - - + + // does not support network paths @@ -21766,8 +21771,8 @@ class HTMLPurifier_URIFilter_MakeAbsolute extends HTMLPurifier_URIFilter } } - - + + class HTMLPurifier_URIFilter_Munge extends HTMLPurifier_URIFilter @@ -21882,8 +21887,8 @@ class HTMLPurifier_URIFilter_Munge extends HTMLPurifier_URIFilter } } - - + + /** @@ -21951,8 +21956,8 @@ class HTMLPurifier_URIFilter_SafeIframe extends HTMLPurifier_URIFilter } } - - + + /** @@ -22089,7 +22094,7 @@ class HTMLPurifier_URIScheme_data extends HTMLPurifier_URIScheme { } } - + /** @@ -22133,8 +22138,8 @@ class HTMLPurifier_URIScheme_file extends HTMLPurifier_URIScheme } } - - + + /** @@ -22192,8 +22197,8 @@ class HTMLPurifier_URIScheme_ftp extends HTMLPurifier_URIScheme } } - - + + /** @@ -22229,8 +22234,8 @@ class HTMLPurifier_URIScheme_http extends HTMLPurifier_URIScheme } } - - + + /** @@ -22248,8 +22253,8 @@ class HTMLPurifier_URIScheme_https extends HTMLPurifier_URIScheme_http public $secure = true; } - - + + // VERY RELAXED! Shouldn't cause problems, not even Firefox checks if the @@ -22289,8 +22294,8 @@ class HTMLPurifier_URIScheme_mailto extends HTMLPurifier_URIScheme } } - - + + /** @@ -22325,8 +22330,8 @@ class HTMLPurifier_URIScheme_news extends HTMLPurifier_URIScheme } } - - + + /** @@ -22358,8 +22363,8 @@ class HTMLPurifier_URIScheme_nntp extends HTMLPurifier_URIScheme } } - - + + /** @@ -22405,8 +22410,8 @@ class HTMLPurifier_URIScheme_tel extends HTMLPurifier_URIScheme } } - - + + /** @@ -22536,8 +22541,8 @@ class HTMLPurifier_VarParser_Flexible extends HTMLPurifier_VarParser } } - - + + /** @@ -22575,5 +22580,5 @@ class HTMLPurifier_VarParser_Native extends HTMLPurifier_VarParser } } - - + +