1
0
mirror of https://github.com/ezyang/htmlpurifier.git synced 2025-07-31 03:10:09 +02:00

More refactoring: bundling charset and entity stuff together makes little sense, so new HTMLPurifier/EntityParser.php.

git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@341 48356398-32a2-884e-a903-53898d9a118a
This commit is contained in:
Edward Z. Yang
2006-08-30 02:21:39 +00:00
parent 89376a11e3
commit 0ac97774d4
7 changed files with 309 additions and 259 deletions

View File

@@ -2,6 +2,7 @@
require_once 'HTMLPurifier/Token.php';
require_once 'HTMLPurifier/Encoder.php';
require_once 'HTMLPurifier/EntityParser.php';
HTMLPurifier_ConfigDef::define(
'Core', 'AcceptFullDocuments', true, 'bool',
@@ -57,6 +58,7 @@ class HTMLPurifier_Lexer
function HTMLPurifier_Lexer() {
$this->_encoder = new HTMLPurifier_Encoder();
$this->_entity_parser = new HTMLPurifier_EntityParser();
}
var $_encoder;
@@ -152,7 +154,7 @@ class HTMLPurifier_Lexer
$html = $this->escapeCDATA($html);
// expand entities that aren't the big five
$html = $this->_encoder->substituteNonSpecialEntities($html);
$html = $this->_entity_parser->substituteNonSpecialEntities($html);
// clean into wellformed UTF-8 string for an SGML context: this has
// to be done after entity expansion because the entities sometimes