diff --git a/library/HTMLPurifier/IDAccumulator.php b/library/HTMLPurifier/IDAccumulator.php index a90f93f7..eb6f512f 100644 --- a/library/HTMLPurifier/IDAccumulator.php +++ b/library/HTMLPurifier/IDAccumulator.php @@ -5,23 +5,11 @@ class HTMLPurifier_IDAccumulator var $ids = array(); - function &instance() { - static $instance = null; - if (empty($instance)) { - $instance = new HTMLPurifier_IDAccumulator(); - } - return $instance; - } - function add($id) { if (isset($this->ids[$id])) return false; return $this->ids[$id] = true; } - function reset() { - $this->ids = array(); - } - } ?> \ No newline at end of file diff --git a/tests/HTMLPurifier/IDAccumulatorTest.php b/tests/HTMLPurifier/IDAccumulatorTest.php index 377e973e..b5a82d3c 100644 --- a/tests/HTMLPurifier/IDAccumulatorTest.php +++ b/tests/HTMLPurifier/IDAccumulatorTest.php @@ -8,16 +8,11 @@ class HTMLPurifier_IDAccumulatorTest extends UnitTestCase function test() { // initialize the accumulator - $accumulator = HTMLPurifier_IDAccumulator::instance(); - $accumulator->reset(); + $accumulator = new HTMLPurifier_IDAccumulator(); $this->assertTrue( $accumulator->add('id1')); $this->assertTrue( $accumulator->add('id2')); $this->assertFalse($accumulator->add('id1')); // repeated id - $accumulator->reset(); - - $this->assertTrue( $accumulator->add('id2')); // test reset - $accumulator->reset(); }