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

Factor out DirectLex error testing to its own class.

Browse Source 
git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@1230 48356398-32a2-884e-a903-53898d9a118a
This commit is contained in:
Edward Z. Yang
2007-06-25 01:56:00 +00:00
parent e66a98c396
commit 0e9904a9ba
7 changed files with 84 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/HTMLPurifier/ErrorCollector.php
View File

@@ -37,8 +37,8 @@ class HTMLPurifier_ErrorCollector
$msg = $this->locale->formatMessage($msg, $args);
}
$line = $this->context->get('CurrentLine', true);
$token = $this->context->get('CurrentToken', true);
$line = $token ? $token->line : $this->context->get('CurrentLine', true);
$attr = $this->context->get('CurrentAttr', true);
$this->errors[] = array($line, $severity, $msg);

1
library/HTMLPurifier/Lexer/DirectLex.php
View File

@@ -312,7 +312,6 @@ class HTMLPurifier_Lexer_DirectLex extends HTMLPurifier_Lexer
$e = false;
if ($config->get('Core', 'CollectErrors')) {
$e =& $context->get('ErrorCollector');
$current_line =& $context->get('CurrentLine');
}
// let's see if we can abort as quickly as possible

6
library/HTMLPurifier/Strategy/RemoveForeignElements.php
View File

@@ -53,6 +53,9 @@ class HTMLPurifier_Strategy_RemoveForeignElements extends HTMLPurifier_Strategy
// converts comments into text tokens when this is equal to a tag name
$textify_comments = false;
$token = false;
$context->register('CurrentToken', $token);
foreach($tokens as $token) {
if ($remove_until) {
if (empty($token->is_tag) || $token->name !== $remove_until) {
@@ -134,6 +137,9 @@ class HTMLPurifier_Strategy_RemoveForeignElements extends HTMLPurifier_Strategy
}
$result[] = $token;
}
$context->destroy('CurrentToken');
return $result;
}