MDL-19871 imported htmlpurifier 4.0.0

2009-07-19 11:56:56 +00:00
parent 4c5e3bbe14
commit 97f973f922
84 changed files with 524 additions and 435 deletions
@@ -142,7 +142,8 @@ class HTMLPurifier_ElementDef
        $this->_mergeAssocArray($this->excludes, $def->excludes);

        if(!empty($def->content_model)) {
-            $this->content_model .= ' | ' . $def->content_model;
+            $this->content_model =
+                str_replace("#SUPER", $this->content_model, $def->content_model);
            $this->child = false;
        }
        if(!empty($def->content_model_type)) {