From 556ed4ea904d9ccc6efe5cd3360da9e5447fe250 Mon Sep 17 00:00:00 2001
From: "Edward Z. Yang" <edwardzyang@thewritingpot.com>
Date: Sat, 17 Feb 2007 17:43:44 +0000
Subject: [PATCH] - Shuffle around includes to the right places - Fix error in
 unit test

git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@759 48356398-32a2-884e-a903-53898d9a118a
---
 library/HTMLPurifier/HTMLDefinition.php       | 19 -------------------
 .../HTMLModule/TransformToStrict.php          |  7 +++++++
 library/HTMLPurifier/HTMLModuleManager.php    |  9 ++++++++-
 .../Strategy/ValidateAttributesTest.php       |  2 +-
 4 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/library/HTMLPurifier/HTMLDefinition.php b/library/HTMLPurifier/HTMLDefinition.php
index 70a96640..6fca7fb7 100644
--- a/library/HTMLPurifier/HTMLDefinition.php
+++ b/library/HTMLPurifier/HTMLDefinition.php
@@ -1,26 +1,7 @@
 <?php
 
 // components
-require_once 'HTMLPurifier/AttrTypes.php';
-require_once 'HTMLPurifier/AttrCollections.php';
 require_once 'HTMLPurifier/HTMLModuleManager.php';
-require_once 'HTMLPurifier/ElementDef.php';
-
-require_once 'HTMLPurifier/AttrDef.php';
-require_once 'HTMLPurifier/AttrDef/Enum.php';
-
-// temporary: attribute transformations
-require_once 'HTMLPurifier/AttrTransform.php';
-require_once 'HTMLPurifier/AttrTransform/Lang.php';
-require_once 'HTMLPurifier/AttrTransform/TextAlign.php';
-require_once 'HTMLPurifier/AttrTransform/BdoDir.php';
-require_once 'HTMLPurifier/AttrTransform/ImgRequired.php';
-
-// temporary: tag transformations
-require_once 'HTMLPurifier/TagTransform.php';
-require_once 'HTMLPurifier/TagTransform/Simple.php';
-require_once 'HTMLPurifier/TagTransform/Center.php';
-require_once 'HTMLPurifier/TagTransform/Font.php';
 
 // this definition and its modules MUST NOT define configuration directives
 // outside of the HTML or Attr namespaces
diff --git a/library/HTMLPurifier/HTMLModule/TransformToStrict.php b/library/HTMLPurifier/HTMLModule/TransformToStrict.php
index 5c75a0da..d228f84f 100644
--- a/library/HTMLPurifier/HTMLModule/TransformToStrict.php
+++ b/library/HTMLPurifier/HTMLModule/TransformToStrict.php
@@ -2,6 +2,13 @@
 
 require_once 'HTMLPurifier/ChildDef/StrictBlockquote.php';
 
+require_once 'HTMLPurifier/TagTransform/Simple.php';
+require_once 'HTMLPurifier/TagTransform/Center.php';
+require_once 'HTMLPurifier/TagTransform/Font.php';
+
+require_once 'HTMLPurifier/AttrTransform/Lang.php';
+require_once 'HTMLPurifier/AttrTransform/TextAlign.php';
+
 /**
  * Proprietary module that transforms deprecated elements into Strict
  * HTML (see HTML 4.01 and XHTML 1.0) when possible.
diff --git a/library/HTMLPurifier/HTMLModuleManager.php b/library/HTMLPurifier/HTMLModuleManager.php
index ba085383..31359940 100644
--- a/library/HTMLPurifier/HTMLModuleManager.php
+++ b/library/HTMLPurifier/HTMLModuleManager.php
@@ -1,7 +1,14 @@
 <?php
 
-require_once 'HTMLPurifier/ContentSets.php';
 require_once 'HTMLPurifier/HTMLModule.php';
+require_once 'HTMLPurifier/ElementDef.php';
+
+require_once 'HTMLPurifier/ContentSets.php';
+require_once 'HTMLPurifier/AttrTypes.php';
+require_once 'HTMLPurifier/AttrCollections.php';
+
+require_once 'HTMLPurifier/AttrDef.php';
+require_once 'HTMLPurifier/AttrDef/Enum.php';
 
 // W3C modules
 require_once 'HTMLPurifier/HTMLModule/CommonAttributes.php';
diff --git a/tests/HTMLPurifier/Strategy/ValidateAttributesTest.php b/tests/HTMLPurifier/Strategy/ValidateAttributesTest.php
index 750d972c..048369dd 100644
--- a/tests/HTMLPurifier/Strategy/ValidateAttributesTest.php
+++ b/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>