From bda9167423fc557c685df31e49384622921fa77f Mon Sep 17 00:00:00 2001 From: "Edward Z. Yang" Date: Sat, 12 May 2007 21:47:03 +0000 Subject: [PATCH] [1.7.0] Modify behavior of ElementDef->mergeIn to also merge safe property, this means default is now null. git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@1048 48356398-32a2-884e-a903-53898d9a118a --- library/HTMLPurifier/ElementDef.php | 3 ++- tests/HTMLPurifier/ElementDefTest.php | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/library/HTMLPurifier/ElementDef.php b/library/HTMLPurifier/ElementDef.php index eb6ff271..6af5a09c 100644 --- a/library/HTMLPurifier/ElementDef.php +++ b/library/HTMLPurifier/ElementDef.php @@ -90,7 +90,7 @@ class HTMLPurifier_ElementDef /** * Is this element safe for untrusted users to use? */ - var $safe = false; + var $safe; /** * Low-level factory constructor for creating new standalone element defs @@ -137,6 +137,7 @@ class HTMLPurifier_ElementDef if(!empty($def->content_model)) $this->content_model .= ' | ' . $def->content_model; if(!empty($def->content_model_type)) $this->content_model_type = $def->content_model_type; if(!is_null($def->descendants_are_inline)) $this->descendants_are_inline = $def->descendants_are_inline; + if(!is_null($def->safe)) $this->safe = $def->safe; } diff --git a/tests/HTMLPurifier/ElementDefTest.php b/tests/HTMLPurifier/ElementDefTest.php index 893e450f..6ac7b521 100644 --- a/tests/HTMLPurifier/ElementDefTest.php +++ b/tests/HTMLPurifier/ElementDefTest.php @@ -42,6 +42,7 @@ class HTMLPurifier_ElementDefTest extends UnitTestCase 'old' => true, 'removed-old' => true ); + $def1->safe = false; $def2->standalone = false; $def2->attr = array( @@ -68,6 +69,7 @@ class HTMLPurifier_ElementDefTest extends UnitTestCase 'new' => true, 'removed-old' => false ); + $def2->safe = true; $def1->mergeIn($def2); $def1->mergeIn($def3); // empty, has no effect @@ -97,6 +99,7 @@ class HTMLPurifier_ElementDefTest extends UnitTestCase 'old' => true, 'new' => true )); + $this->assertIdentical($def1->safe, true); }