update HTMLPurifier; enable embedded flash video in articles

6 files changed, 2 insertions, 1 deletions

diff --git a/lib/htmlpurifier/library/HTMLPurifier/Token/Comment.php b/lib/htmlpurifier/library/HTMLPurifier/Token/Comment.php
index dc6bdcabb..dc6bdcabb 100755..100644
--- a/lib/htmlpurifier/library/HTMLPurifier/Token/Comment.php
+++ b/lib/htmlpurifier/library/HTMLPurifier/Token/Comment.php
diff --git a/lib/htmlpurifier/library/HTMLPurifier/Token/Empty.php b/lib/htmlpurifier/library/HTMLPurifier/Token/Empty.php
index 2a82b47ad..2a82b47ad 100755..100644
--- a/lib/htmlpurifier/library/HTMLPurifier/Token/Empty.php
+++ b/lib/htmlpurifier/library/HTMLPurifier/Token/Empty.php
diff --git a/lib/htmlpurifier/library/HTMLPurifier/Token/End.php b/lib/htmlpurifier/library/HTMLPurifier/Token/End.php
index 353e79daf..353e79daf 100755..100644
--- a/lib/htmlpurifier/library/HTMLPurifier/Token/End.php
+++ b/lib/htmlpurifier/library/HTMLPurifier/Token/End.php
diff --git a/lib/htmlpurifier/library/HTMLPurifier/Token/Start.php b/lib/htmlpurifier/library/HTMLPurifier/Token/Start.php
index e0e14fc62..e0e14fc62 100755..100644
--- a/lib/htmlpurifier/library/HTMLPurifier/Token/Start.php
+++ b/lib/htmlpurifier/library/HTMLPurifier/Token/Start.php
diff --git a/lib/htmlpurifier/library/HTMLPurifier/Token/Tag.php b/lib/htmlpurifier/library/HTMLPurifier/Token/Tag.php
index 798be028e..f4d8f640e 100755..100644
--- a/lib/htmlpurifier/library/HTMLPurifier/Token/Tag.php
+++ b/lib/htmlpurifier/library/HTMLPurifier/Token/Tag.php
@@ -33,7 +33,7 @@ class HTMLPurifier_Token_Tag extends HTMLPurifier_Token
      * @param $name String name.
      * @param $attr Associative array of attributes.
      */
-    public function __construct($name, $attr = array(), $line = null, $col = null) {
+    public function __construct($name, $attr = array(), $line = null, $col = null, $armor = array()) {
         $this->name = ctype_lower($name) ? $name : strtolower($name);
         foreach ($attr as $key => $value) {
             // normalization only necessary when key is not lowercase
@@ -50,6 +50,7 @@ class HTMLPurifier_Token_Tag extends HTMLPurifier_Token
         $this->attr = $attr;
         $this->line = $line;
         $this->col  = $col;
+        $this->armor = $armor;
     }
 }
 
diff --git a/lib/htmlpurifier/library/HTMLPurifier/Token/Text.php b/lib/htmlpurifier/library/HTMLPurifier/Token/Text.php
index 82efd823d..82efd823d 100755..100644
--- a/lib/htmlpurifier/library/HTMLPurifier/Token/Text.php
+++ b/lib/htmlpurifier/library/HTMLPurifier/Token/Text.php