[3.1.0] Landed modified patch by Braden Anderson for %CSS.AllowedProperties

- Fix broken ConfigSchema build, as well as broken aliases
- Remove another advisory property from runtime ConfigSchema classes
- Reorder flush script to more accurately reflect dependencies
- Remove some aliases from unit tests

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

library/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php

@@ -9,10 +9,10 @@ class HTMLPurifier_ConfigSchema_Builder_ConfigSchema
     
     public function build($interchange) {
         $schema = new HTMLPurifier_ConfigSchema();
-        foreach ($this->namespaces as $n) {
+        foreach ($interchange->namespaces as $n) {
             $schema->addNamespace($n->namespace);
         }
-        foreach ($this->directives as $d) {
+        foreach ($interchange->directives as $d) {
             $schema->add(
                 $d->id->namespace,
                 $d->id->directive,
@@ -29,8 +29,8 @@ class HTMLPurifier_ConfigSchema_Builder_ConfigSchema
             }
             foreach ($d->aliases as $alias) {
                 $schema->addAlias(
-                    $alias->id->namespace,
-                    $alias->id->directive,
+                    $alias->namespace,
+                    $alias->directive,
                     $d->id->namespace,
                     $d->id->directive
                 );
@@ -43,6 +43,7 @@ class HTMLPurifier_ConfigSchema_Builder_ConfigSchema
                 );
             }
         }
+        return $schema;
     }
     
 }

library/HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt

@@ -0,0 +1,17 @@
+CSS.AllowedProperties
+TYPE: lookup/null
+VERSION: 3.1.0
+DEFAULT: NULL
+--DESCRIPTION--
+
+<p>
+    If HTML Purifier's style attributes set is unsatisfactory for your needs, 
+    you can overload it with your own list of tags to allow.  Note that this 
+    method is subtractive: it does its job by taking away from HTML Purifier 
+    usual feature set, so you cannot add an attribute that HTML Purifier never 
+    supported in the first place.
+</p>
+<p>
+    <strong>Warning:</strong> If another directive conflicts with the 
+    elements here, <em>that</em> directive will win and override. 
+</p>

library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocksScope.txt

@@ -1,5 +1,5 @@
 Filter.ExtractStyleBlocksScope
-TYPE: string
+TYPE: string/null
 VERSION: 3.0.0
 DEFAULT: NULL
 --DESCRIPTION--