mirror of
https://github.com/ezyang/htmlpurifier.git
synced 2025-08-04 13:18:00 +02:00
Add configuration as a parameter to all AttrDef objects. If we get another construction like accumulator, however, we'll have to create an AttrContext object.
git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@156 48356398-32a2-884e-a903-53898d9a118a
This commit is contained in:
@@ -6,7 +6,7 @@ require_once 'HTMLPurifier/IDAccumulator.php';
|
||||
class HTMLPurifier_AttrDef_ID extends HTMLPurifier_AttrDef
|
||||
{
|
||||
|
||||
function validate($old_id, &$accumulator) {
|
||||
function validate($old_id, $config, &$accumulator) {
|
||||
|
||||
$id = trim($old_id); // trim it first
|
||||
|
||||
|
@@ -34,17 +34,21 @@ class HTMLPurifier_Strategy_ValidateAttributes extends HTMLPurifier_Strategy
|
||||
$attr = $token->attributes;
|
||||
$changed = false;
|
||||
foreach ($attr as $attr_key => $value) {
|
||||
|
||||
// call the definition
|
||||
if ( isset($defs[$attr_key]) ) {
|
||||
if (!$defs[$attr_key]) {
|
||||
$result = false;
|
||||
} else {
|
||||
$result = $defs[$attr_key]->validate($value, $accumulator);
|
||||
$result = $defs[$attr_key]->validate($value, $config, $accumulator);
|
||||
}
|
||||
} elseif ( isset($d_defs[$attr_key]) ) {
|
||||
$result = $d_defs[$attr_key]->validate($value, $accumulator);
|
||||
$result = $d_defs[$attr_key]->validate($value, $config, $accumulator);
|
||||
} else {
|
||||
$result = false;
|
||||
}
|
||||
|
||||
// put the results into effect
|
||||
if ($result === false) {
|
||||
$changed = true;
|
||||
unset($attr[$attr_key]);
|
||||
|
Reference in New Issue
Block a user