Merge 1.5.2.3 (~r10623)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10624 201d5d3c-b55e-5fd7-737f-ddc643e51545

classes/security/htmlpurifier/tests/HTMLPurifier/HTMLModule/ProprietaryTest.php

@@ -0,0 +1,30 @@
+<?php
+
+class HTMLPurifier_HTMLModule_ProprietaryTest extends HTMLPurifier_HTMLModuleHarness
+{
+
+    function setUp() {
+        parent::setUp();
+        $this->config->set('HTML.Proprietary', true);
+    }
+
+    function testMarquee() {
+        $this->assertResult(
+            '<span><marquee
+                width="20%"
+                height="34"
+                direction="left"
+                behavior="alternate"
+                scrolldelay="3"
+                scrollamount="5"
+                loop="4"
+                bgcolor="#FF0000"
+                hspace="5"
+                vspace="3"
+                ><div>Block</div><span>Inline</span>Text</marquee></span>'
+        );
+    }
+
+}
+
+// vim: et sw=4 sts=4