From f4f0f80d2118437e5047ba266f92d7acb3c38fb7 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Mon, 11 Apr 2011 16:41:01 +0400
Subject: update HTMLPurifier; enable embedded flash video in articles

---
 lib/htmlpurifier/library/HTMLPurifier/ElementDef.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
 mode change 100755 => 100644 lib/htmlpurifier/library/HTMLPurifier/ElementDef.php

(limited to 'lib/htmlpurifier/library/HTMLPurifier/ElementDef.php')

diff --git a/lib/htmlpurifier/library/HTMLPurifier/ElementDef.php b/lib/htmlpurifier/library/HTMLPurifier/ElementDef.php
old mode 100755
new mode 100644
index b55c7bd79..5498d9567
--- a/lib/htmlpurifier/library/HTMLPurifier/ElementDef.php
+++ b/lib/htmlpurifier/library/HTMLPurifier/ElementDef.php
@@ -97,6 +97,13 @@ class HTMLPurifier_ElementDef
      */
     public $autoclose = array();
 
+    /**
+     * If a foreign element is found in this element, test if it is
+     * allowed by this sub-element; if it is, instead of closing the
+     * current element, place it inside this element.
+     */
+    public $wrap;
+
     /**
      * Whether or not this is a formatting element affected by the
      * "Active Formatting Elements" algorithm.
@@ -142,7 +149,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)) {
-- 
cgit v1.2.3