@@ -23,6 +23,9 @@ NEWS ( CHANGELOG and HISTORY ) HTMLPurifier # The allowed values for class have been relaxed to allow all of CDATA for doctypes that are not XHTML 1.1 or XHTML 2.0. For old behavior, set %Attr.ClassUseCDATA to false. +# Instead of appending the content model to an old content model, a blank + element will replace the old content model. You can use #SUPER to get + the old content model. ! More robust support for name="" and id="" ! HTMLPurifier_Config::inherit($config) allows you to inherit one configuration, and have changes to that configuration be propagated @@ -46,6 +49,7 @@ NEWS ( CHANGELOG and HISTORY ) HTMLPurifier - Fix bug where URIDefinition would not get cleared if it's directives got changed. - Fix fatal error in HTMLPurifier_Encoder on certain platforms (probably NetBSD 5.0) +- Fix bug in Linkify autoformatter involving <a><span>http://foo</span></a> . Created script maintenance/rename-config.php for renaming a configuration directive while maintaining its alias. This script does not change source code. . Implement namespace locking for definition construction, to prevent NEWS @@ -142,7 +142,8 @@ class HTMLPurifier_ElementDef $this->_mergeAssocArray($this->excludes, $def->excludes); if(!empty($def->content_model)) { - $this->content_model .= ' | ' . $def->content_model; + $this->content_model = + str_replace("#SUPER", $this->content_model, $def->content_model); $this->child = false; } if(!empty($def->content_model_type)) { library/HTMLPurifier/ElementDef.php @@ -51,7 +51,7 @@ class HTMLPurifier_ElementDefTest extends HTMLPurifier_Harness 'removed-transform' => false, ); $def2->child = $new; - $def2->content_model = 'new'; + $def2->content_model = '#SUPER | new'; $def2->content_model_type = $overloaded_new; $def2->descendants_are_inline = true; $def2->excludes = array( tests/HTMLPurifier/ElementDefTest.php 733a5ce5c36f232fcc17df9071f4410362434fed Edward Z. Yang edwardzyang@thewritingpot.com http://github.com/ezyang/htmlpurifier/commit/c7594487a259325b48bb17824bd733ab69793c0f c7594487a259325b48bb17824bd733ab69793c0f 2009-06-10T15:24:52-07:00 2009-06-10T15:24:52-07:00 Fix inability to totally override content model. Signed-off-by: Edward Z. Yang <edwardzyang@thewritingpot.com> 33cf92f78cb70f680ff2e159b327a01082e4a236 Edward Z. Yang edwardzyang@thewritingpot.com