Release 1.5.0, merged in r688-867.

- LanguageFactory::instance() declared static
- HTMLModuleManagerTest pass by reference bug fixed, merge back into trunk scheduled

git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/branches/strict@869 48356398-32a2-884e-a903-53898d9a118a

tests/HTMLPurifier/Strategy/FixNestingTest.php

@@ -70,19 +70,33 @@ class HTMLPurifier_Strategy_FixNestingTest extends HTMLPurifier_StrategyHarness
           '<span><ins>Not allowed!</ins></span>'
         );
         
-        // block in inline ins not allowed
-        $this->assertResult(
+        $this->assertResult( // alt config
           '<span><ins><div>Not allowed!</div></ins></span>',
           '<span><ins>&lt;div&gt;Not allowed!&lt;/div&gt;</ins></span>',
           array('Core.EscapeInvalidChildren' => true)
         );
         
+        // test block element that has inline content
+        $this->assertResult(
+          '<h1><ins><div>Not allowed!</div></ins></h1>',
+          '<h1><ins>Not allowed!</ins></h1>'
+        );
+        
         // test exclusions
         $this->assertResult(
           '<a><span><a>Not allowed</a></span></a>',
           '<a><span></span></a>'
         );
         
+        // stacked ins/del
+        $this->assertResult(
+          '<h1><ins><del><div>Not allowed!</div></del></ins></h1>',
+          '<h1><ins><del>Not allowed!</del></ins></h1>'
+        );
+        $this->assertResult(
+          '<div><ins><del><div>Allowed!</div></del></ins></div>'
+        );
+        
         // test inline parent
         $this->assertResult(
             '<b>Bold</b>', true, array('HTML.Parent' => 'span')

tests/HTMLPurifier/Strategy/ValidateAttributesTest.php

@@ -100,7 +100,7 @@ class HTMLPurifier_Strategy_ValidateAttributesTest extends
         $this->assertResult(
 '<table frame="above" rules="rows" summary="A test table" border="2" cellpadding="5%" cellspacing="3" width="100%">
     <col align="right" width="4*" />
-    <col charoff="5" align="char" width="1*" />
+    <col charoff="5" align="char" width="*" />
     <tr valign="top">
         <th abbr="name">Fiddly name</th>
         <th abbr="price">Super-duper-price</th>