1
0
mirror of https://github.com/ezyang/htmlpurifier.git synced 2025-08-06 06:07:26 +02:00

[3.1.0] Move $safe from ElementDef to HTMLModule

- Make $info in AttrTypes protected, to force cloning
- Remove copy() functions in favor of clone

git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@1664 48356398-32a2-884e-a903-53898d9a118a
This commit is contained in:
Edward Z. Yang
2008-04-21 23:28:52 +00:00
parent 59605d592b
commit 50aa0ea714
27 changed files with 145 additions and 153 deletions

View File

@@ -90,17 +90,11 @@ class HTMLPurifier_ElementDef
*/
public $excludes = array();
/**
* Is this element safe for untrusted users to use?
*/
public $safe;
/**
* Low-level factory constructor for creating new standalone element defs
*/
public static function create($safe, $content_model, $content_model_type, $attr) {
public static function create($content_model, $content_model_type, $attr) {
$def = new HTMLPurifier_ElementDef();
$def->safe = (bool) $safe;
$def->content_model = $content_model;
$def->content_model_type = $content_model_type;
$def->attr = $attr;
@@ -144,7 +138,6 @@ class HTMLPurifier_ElementDef
}
if(!is_null($def->child)) $this->child = $def->child;
if($def->descendants_are_inline) $this->descendants_are_inline = $def->descendants_are_inline;
if(!is_null($def->safe)) $this->safe = $def->safe;
}
@@ -163,13 +156,6 @@ class HTMLPurifier_ElementDef
}
}
/**
* Retrieves a copy of the element definition
*/
public function copy() {
return unserialize(serialize($this));
}
}