From ebe01a0a24789595ae6cb6f97c1452e7a072784e Mon Sep 17 00:00:00 2001
From: "Edward Z. Yang" <edwardzyang@thewritingpot.com>
Date: Sat, 12 Aug 2006 16:12:16 +0000
Subject: [PATCH] Fix a few errors that came with API change. I really should
 run the unit tests before committing.

git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@213 48356398-32a2-884e-a903-53898d9a118a
---
 library/HTMLPurifier/AttrDef/Length.php      | 2 +-
 library/HTMLPurifier/AttrDef/MultiLength.php | 2 +-
 tests/HTMLPurifier/AttrDef/URITest.php       | 8 +++++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/library/HTMLPurifier/AttrDef/Length.php b/library/HTMLPurifier/AttrDef/Length.php
index 6fb443a9..f2a44c20 100644
--- a/library/HTMLPurifier/AttrDef/Length.php
+++ b/library/HTMLPurifier/AttrDef/Length.php
@@ -11,7 +11,7 @@ class HTMLPurifier_AttrDef_Length extends HTMLPurifier_AttrDef_Pixels
         $string = trim($string);
         if ($string === '') return false;
         
-        $parent_result = parent::validate($string);
+        $parent_result = parent::validate($string, $config, $context);
         if ($parent_result !== false) return $parent_result;
         
         $length = strlen($string);
diff --git a/library/HTMLPurifier/AttrDef/MultiLength.php b/library/HTMLPurifier/AttrDef/MultiLength.php
index c89ca198..d14ecfee 100644
--- a/library/HTMLPurifier/AttrDef/MultiLength.php
+++ b/library/HTMLPurifier/AttrDef/MultiLength.php
@@ -11,7 +11,7 @@ class HTMLPurifier_AttrDef_MultiLength extends HTMLPurifier_AttrDef_Length
         $string = trim($string);
         if ($string === '') return false;
         
-        $parent_result = parent::validate($string);
+        $parent_result = parent::validate($string, $config, $context);
         if ($parent_result !== false) return $parent_result;
         
         $length = strlen($string);
diff --git a/tests/HTMLPurifier/AttrDef/URITest.php b/tests/HTMLPurifier/AttrDef/URITest.php
index 9a1ffad9..0c079b33 100644
--- a/tests/HTMLPurifier/AttrDef/URITest.php
+++ b/tests/HTMLPurifier/AttrDef/URITest.php
@@ -175,6 +175,12 @@ class HTMLPurifier_AttrDef_URITest extends HTMLPurifier_AttrDefHarness
             if (!isset($expect_uri[$i])) {
                 $expect_uri[$i] = $value;
             }
+            if (!isset($config[$i])) {
+                $config[$i] = HTMLPurifier_Config::createDefault();
+            }
+            if (!isset($context[$i])) {
+                $context[$i] = new HTMLPurifier_AttrContext();
+            }
             if ($components[$i] === false) {
                 $scheme->expectNever('validateComponents');
             } else {
@@ -182,7 +188,7 @@ class HTMLPurifier_AttrDef_URITest extends HTMLPurifier_AttrDefHarness
                     'validateComponents', $return_components[$i], $components[$i]);
                 $scheme->expectOnce('validateComponents', $components[$i]);
             }
-            $result = $def->validate($value);
+            $result = $def->validate($value, $config[$i], $context[$i]);
             $scheme->tally();
             $this->assertIdentical($expect_uri[$i], $result, "Test $i: %s");