mirror/php-htmlpurifier
1
0
Fork 0
mirror of https://github.com/ezyang/htmlpurifier.git synced 2025-07-10 01:06:20 +02:00
Code Issues Releases Wiki Activity

Migrate default attribute collections to their own module, do late-loading of the attribute collection.

Browse Source 
git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@754 48356398-32a2-884e-a903-53898d9a118a
This commit is contained in:
Edward Z. Yang
2007-02-16 03:07:47 +00:00
parent e55babdc53
commit 5c4a0a6785
3 changed files with 41 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
library/HTMLPurifier/HTMLModuleManager.php
View File

@ -4,6 +4,7 @@ require_once 'HTMLPurifier/ContentSets.php';
require_once 'HTMLPurifier/HTMLModule.php';
// W3C modules
require_once 'HTMLPurifier/HTMLModule/CommonAttributes.php';
require_once 'HTMLPurifier/HTMLModule/Text.php';
require_once 'HTMLPurifier/HTMLModule/Hypertext.php';
require_once 'HTMLPurifier/HTMLModule/List.php';
@ -41,6 +42,7 @@ class HTMLPurifier_HTMLModuleManager
*/
var $collectionsSafe = array(
'_Common' => array( // leading _ indicates private
'CommonAttributes',
'Text',
'Hypertext',
'List',
@ -103,6 +105,7 @@ class HTMLPurifier_HTMLModuleManager
// modules
$modules = array(
// define
'CommonAttributes',
'Text', 'Hypertext', 'List', 'Presentation',
'Edit', 'Bdo', 'Tables', 'Image', 'StyleAttribute',
// define-redefine
@ -115,8 +118,9 @@ class HTMLPurifier_HTMLModuleManager
$this->addModule($module);
}
$this->attrTypes = new HTMLPurifier_AttrTypes();
$this->attrCollections = new HTMLPurifier_AttrCollections();
// the only editable internal object. The rest need to
// be manipulated through modules
$this->attrTypes = new HTMLPurifier_AttrTypes();
}
@ -200,7 +204,7 @@ class HTMLPurifier_HTMLModuleManager
$this->contentSets = new HTMLPurifier_ContentSets(
$this->getModules($config, true)
);
$this->attrCollections->setup($this->attrTypes,
$this->attrCollections = new HTMLPurifier_AttrCollections($this->attrTypes,
$this->getModules($config));
}