mirror/php-htmlpurifier
1
0
Fork 0
mirror of https://github.com/ezyang/htmlpurifier.git synced 2025-08-02 20:27:40 +02:00
Code Issues Releases Wiki Activity

[2.0.1] Rather than pass line number by parameter, have it be retrieved via Context. Add $ignore_error boolean to get().

Browse Source 
git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@1228 48356398-32a2-884e-a903-53898d9a118a
This commit is contained in:
Edward Z. Yang
2007-06-25 01:08:57 +00:00
parent 8ae2604440
commit 728088f2ba
5 changed files with 59 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
library/HTMLPurifier/ErrorCollector.php
View File

@@ -11,8 +11,12 @@ class HTMLPurifier_ErrorCollector
var $errors = array();
var $locale;
var $context;
function HTMLPurifier_ErrorCollector(&$locale) {$this->locale =& $locale;}
function HTMLPurifier_ErrorCollector(&$context) {
$this->locale =& $context->get('Locale');
$this->context =& $context;
}
/**
* Sends an error message to the collector for later use
@@ -20,20 +24,23 @@ class HTMLPurifier_ErrorCollector
* @param $severity int Error severity, PHP error style (don't use E_USER_)
* @param $msg string Error message text
*/
function send($line, $severity, $msg) {
$token = false;
if ($line && !is_int($line)) {
$token = $line;
$line = $token->line;
if (!$line) $line = false;
}
if (func_num_args() == 3) $msg = $this->locale->getMessage($msg);
else {
$args = func_get_args();
array_splice($args, 0, 2); // one less to make 1-based
unset($args[0]);
function send($severity, $msg, $args = array()) {
if (func_num_args() == 2) {
$msg = $this->locale->getMessage($msg);
} else {
// setup one-based array if necessary
if (!is_array($args)) {
$args = func_get_args();
array_shift($args);
unset($args[0]);
}
$msg = $this->locale->formatMessage($msg, $args);
}
$line = $this->context->get('CurrentLine', true);
$token = $this->context->get('CurrentToken', true);
$attr = $this->context->get('CurrentAttr', true);
$this->errors[] = array($line, $severity, $msg);
}