From ba0e78e269aa97beeed0392074530398771892b8 Mon Sep 17 00:00:00 2001
From: dmolavi <dmolavi@gmail.com>
Date: Fri, 7 Jan 2011 15:36:16 -0500
Subject: [PATCH 01/10] Fix for CSS display issues. Closes 1583

---
 3.0/modules/ecard/helpers/ecard_block.php    | 2 +-
 3.0/modules/ecard/views/ecard_block.html.php | 4 ++--
 3.1/modules/ecard/helpers/ecard_block.php    | 2 +-
 3.1/modules/ecard/views/ecard_block.html.php | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/3.0/modules/ecard/helpers/ecard_block.php b/3.0/modules/ecard/helpers/ecard_block.php
index 051c55c6..89e818d7 100644
--- a/3.0/modules/ecard/helpers/ecard_block.php
+++ b/3.0/modules/ecard/helpers/ecard_block.php
@@ -28,7 +28,7 @@ class ecard_block_Core {
     case "ecard":
       if ($theme->item() && $theme->item()->is_photo() && module::get_var("ecard", "location") == "sidebar") {
         $block = new Block();
-        $block->css_id = "g-send-ecard";
+        $block->css_id = "g-sendecard";
         $block->title = t("eCard");
         $block->content = new View("ecard_block.html");
       }
diff --git a/3.0/modules/ecard/views/ecard_block.html.php b/3.0/modules/ecard/views/ecard_block.html.php
index 3f307a1d..d8aa4e4e 100644
--- a/3.0/modules/ecard/views/ecard_block.html.php
+++ b/3.0/modules/ecard/views/ecard_block.html.php
@@ -1,6 +1,6 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<a href="<?= url::site("ecard/form_send/{$item->id}") ?>" id="g-send-ecard"
+<a href="<?= url::site("ecard/form_send/{$item->id}") ?>" 
    class="g-dialog-link g-button ui-state-default ui-corner-all">
-  <span class="ui-icon-ecard"></span>
+  <span class="ui-icon-ecard" id="g-send-ecard"></span>
   <?= t("Send as eCard") ?>
 </a>
diff --git a/3.1/modules/ecard/helpers/ecard_block.php b/3.1/modules/ecard/helpers/ecard_block.php
index 051c55c6..89e818d7 100644
--- a/3.1/modules/ecard/helpers/ecard_block.php
+++ b/3.1/modules/ecard/helpers/ecard_block.php
@@ -28,7 +28,7 @@ class ecard_block_Core {
     case "ecard":
       if ($theme->item() && $theme->item()->is_photo() && module::get_var("ecard", "location") == "sidebar") {
         $block = new Block();
-        $block->css_id = "g-send-ecard";
+        $block->css_id = "g-sendecard";
         $block->title = t("eCard");
         $block->content = new View("ecard_block.html");
       }
diff --git a/3.1/modules/ecard/views/ecard_block.html.php b/3.1/modules/ecard/views/ecard_block.html.php
index 3f307a1d..d8aa4e4e 100644
--- a/3.1/modules/ecard/views/ecard_block.html.php
+++ b/3.1/modules/ecard/views/ecard_block.html.php
@@ -1,6 +1,6 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<a href="<?= url::site("ecard/form_send/{$item->id}") ?>" id="g-send-ecard"
+<a href="<?= url::site("ecard/form_send/{$item->id}") ?>" 
    class="g-dialog-link g-button ui-state-default ui-corner-all">
-  <span class="ui-icon-ecard"></span>
+  <span class="ui-icon-ecard" id="g-send-ecard"></span>
   <?= t("Send as eCard") ?>
 </a>

From 687b82749564e957d3293f919f6f13487cc76bbb Mon Sep 17 00:00:00 2001
From: Rob <rob@retroguy.org>
Date: Sat, 8 Jan 2011 01:47:48 -0800
Subject: [PATCH 02/10] removed ophan div tag

---
 3.0/modules/albumtree/views/albumtree_block_list.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/3.0/modules/albumtree/views/albumtree_block_list.html.php b/3.0/modules/albumtree/views/albumtree_block_list.html.php
index 43db3a24..0e2cdb6d 100644
--- a/3.0/modules/albumtree/views/albumtree_block_list.html.php
+++ b/3.0/modules/albumtree/views/albumtree_block_list.html.php
@@ -34,5 +34,5 @@
   <? endif ?>
   <? endwhile ?>
   </ul>
-</div>
+
 

From 8035ed40badcd331606e796cbcdd3000f24bafd9 Mon Sep 17 00:00:00 2001
From: Rob <rob@retroguy.org>
Date: Sat, 8 Jan 2011 01:54:54 -0800
Subject: [PATCH 03/10] removed orphan div tag

---
 3.1/modules/albumtree/views/albumtree_block_list.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/3.1/modules/albumtree/views/albumtree_block_list.html.php b/3.1/modules/albumtree/views/albumtree_block_list.html.php
index 43db3a24..0e2cdb6d 100644
--- a/3.1/modules/albumtree/views/albumtree_block_list.html.php
+++ b/3.1/modules/albumtree/views/albumtree_block_list.html.php
@@ -34,5 +34,5 @@
   <? endif ?>
   <? endwhile ?>
   </ul>
-</div>
+
 

From 878ba14230dfc291b26bdf1b26628c0112781698 Mon Sep 17 00:00:00 2001
From: undagiga <git@cyberhalides.com>
Date: Sat, 8 Jan 2011 22:32:08 +1100
Subject: [PATCH 04/10] This is my second attempt to update about_this_photo to
 V3 and to add the new module about_this_album.  Hopefully I have pulled all
 upstream changes this time.

---
 .../helpers/about_this_album_block.php        | 76 +++++++++++++++++++
 3.0/modules/about_this_album/module.info      |  3 +
 .../views/about_this_album.html.php           | 68 +++++++++++++++++
 .../helpers/about_this_photo_block.php        |  2 +-
 3.0/modules/about_this_photo/module.info      |  2 +-
 .../views/about_this_photo.html.php           |  8 +-
 .../helpers/about_this_album_block.php        | 76 +++++++++++++++++++
 3.1/modules/about_this_album/module.info      |  3 +
 .../views/about_this_album.html.php           | 68 +++++++++++++++++
 .../helpers/about_this_photo_block.php        |  2 +-
 3.1/modules/about_this_photo/module.info      |  2 +-
 .../views/about_this_photo.html.php           |  8 +-
 12 files changed, 306 insertions(+), 12 deletions(-)
 create mode 100644 3.0/modules/about_this_album/helpers/about_this_album_block.php
 create mode 100644 3.0/modules/about_this_album/module.info
 create mode 100644 3.0/modules/about_this_album/views/about_this_album.html.php
 create mode 100644 3.1/modules/about_this_album/helpers/about_this_album_block.php
 create mode 100644 3.1/modules/about_this_album/module.info
 create mode 100644 3.1/modules/about_this_album/views/about_this_album.html.php

diff --git a/3.0/modules/about_this_album/helpers/about_this_album_block.php b/3.0/modules/about_this_album/helpers/about_this_album_block.php
new file mode 100644
index 00000000..a2a849e5
--- /dev/null
+++ b/3.0/modules/about_this_album/helpers/about_this_album_block.php
@@ -0,0 +1,76 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2010 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class about_this_album_block_Core {
+
+  static function get_site_list() {
+    return array("aboutthisalbum" => t("About This Album"));
+  }
+
+  static function get($block_id, $theme) {
+    switch ($block_id) {
+    case "aboutthisalbum":
+      $item = $theme->item;
+ 	  if ((!$item) or (!$theme->item->is_album())) {
+        return ""; 
+	  }
+      if ($theme->item->is_album()) {
+        $block = new Block();
+	    $block->css_id = "g-about-this-album";
+	    $block->content = new View("about_this_album.html");
+
+ 	    if ($theme->item()->id == item::root()->id) {
+		  $block->title = t("About this Site");
+		  $block->content->album_count = ORM::factory("item")->where("type", "=", "album")->where("id", "<>", 1)->count_all();
+          $block->content->photo_count = ORM::factory("item")->where("type", "=", "photo")->count_all();
+          $block->content->vcount = Database::instance()->query("SELECT SUM({items}.view_count) as c FROM {items} WHERE type=\"photo\"")->current()->c;
+		} Else {
+           $block->title = t("About this Album");
+           $block->content->album_count = $item->descendants_count(array(array("type", "=", "album"))); 
+           $block->content->photo_count = $item->descendants_count(array(array("type", "=", "photo"))); 
+  	       // $block->content->vcount= $theme->item()->view_count; 
+  	       $descds = $item->descendants();
+		   $descds_view = 0;
+		   foreach ($descds as $descd) {
+		     if ($descd->is_photo()) {
+		       $descds_view += $descd->view_count;
+			 }
+		   }
+		   $block->content->vcount = $descds_view;
+          if ($item->description) {
+            $block->content->description = html::clean($item->description);
+          }
+		}
+
+
+        $all_tags = ORM::factory("tag")
+        ->join("items_tags", "items_tags.tag_id", "tags.id")
+        ->join("items", "items.id", "items_tags.item_id", "LEFT")
+        ->where("items.parent_id", "=", $item->id)
+        ->order_by("tags.id", "ASC")
+        ->find_all();
+        if (count($all_tags) > 0) {
+         $block->content->all_tags = $all_tags;
+        }
+	  }
+      break;
+    }
+    return $block;
+  }
+}
diff --git a/3.0/modules/about_this_album/module.info b/3.0/modules/about_this_album/module.info
new file mode 100644
index 00000000..8080a24d
--- /dev/null
+++ b/3.0/modules/about_this_album/module.info
@@ -0,0 +1,3 @@
+name = "About this Album"
+description = "Show some simple, specific and useful info about a given album"
+version = 1
diff --git a/3.0/modules/about_this_album/views/about_this_album.html.php b/3.0/modules/about_this_album/views/about_this_album.html.php
new file mode 100644
index 00000000..01dee4f7
--- /dev/null
+++ b/3.0/modules/about_this_album/views/about_this_album.html.php
@@ -0,0 +1,68 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<? date_default_timezone_set('Australia/ACT'); ?> 
+<div class="g-metadata">
+<span class="g-about-this">
+<table cellspacing="0" cellpadding="0" border="0">
+<? if ($album_count > 0): ?>
+  <tr>
+    <td><strong class="caption"><?= t("Albums:&nbsp;") ?></strong></td>
+    <td><?= $album_count ?></td>
+  </tr>
+<? endif ?>
+  <tr>
+    <td><strong class="caption"><?= t("Images:&nbsp;") ?></strong></td>
+    <td><?= $photo_count ?></td>
+  </tr>
+  <tr>
+    <td><strong class="caption"><?= t("Views:&nbsp;") ?></strong></td>
+    <td><?= $vcount ?></td>
+  </tr>
+</table>
+  <span >
+  
+  <!--This Div will insert a margin either side of the desciption if there are tags to display-->
+  <? if (count($all_tags) > 0): ?>
+	<div style="margin-top: 10px; margin-bottom: 10px;">
+  <? endif ?>
+
+  <? if ($description <> ""): ?>
+	<strong class="caption"><?= t("Details:&nbsp;") ?></strong>
+    <?= $description ?>
+  </span ><br>
+  <? endif ?>
+  
+    <? if (count($all_tags) > 0): ?>
+	</div>
+  <span >
+      <strong class=="caption"><?= t("Tags:&nbsp;") ?></strong>
+  </span >
+  <?
+  // Create an array to store the tag names and urls in.
+  $display_tags = array();  
+  
+  // Loop through all tags in the album, copying their
+  //   names and urls into the array and skipping duplicates.
+  $last_tagid = "";
+  foreach ($all_tags as $one_tag) {
+    if ($last_tagid != $one_tag->id) {
+      $tag = ORM::factory("tag", $one_tag->id);
+      $display_tags[] = array(html::clean($tag->name), $tag->url());
+      $last_tagid = $one_tag->id;
+    }
+  }
+  
+  // Sort the array.
+  asort($display_tags);
+  
+  // Print out the list of tags as clickable links.
+  $not_first = 0;
+  foreach ($display_tags as $one_tag) {
+    if ($not_first++ > 0) {
+      print ", ";
+    }
+    print "<a href=\"" . $one_tag[1] . "\">" . $one_tag[0] . "</a>";
+  }
+?>
+<? endif ?>
+</span>
+</div>
diff --git a/3.0/modules/about_this_photo/helpers/about_this_photo_block.php b/3.0/modules/about_this_photo/helpers/about_this_photo_block.php
index 86869844..808d19bd 100644
--- a/3.0/modules/about_this_photo/helpers/about_this_photo_block.php
+++ b/3.0/modules/about_this_photo/helpers/about_this_photo_block.php
@@ -54,7 +54,7 @@ class about_this_photo_block_Core {
 	    $record = ORM::factory("iptc_record")->where("item_id", "=", $theme->item()->id)->find();
    	    if ($record->loaded()) {
           $record = unserialize($record->data);
-          $block->content->source = $record["Source"];
+          $block->content->name = $record["ObjectName"];
           $block->content->caption = $record["Caption"];
 		  
   	    }
diff --git a/3.0/modules/about_this_photo/module.info b/3.0/modules/about_this_photo/module.info
index 632c0f05..e324ae3b 100644
--- a/3.0/modules/about_this_photo/module.info
+++ b/3.0/modules/about_this_photo/module.info
@@ -1,3 +1,3 @@
 name = "About this Photo"
 description = "Show some simple, specific and useful info about a given photo"
-version = 2
+version = 3
diff --git a/3.0/modules/about_this_photo/views/about_this_photo.html.php b/3.0/modules/about_this_photo/views/about_this_photo.html.php
index 45db0274..f0ef130a 100644
--- a/3.0/modules/about_this_photo/views/about_this_photo.html.php
+++ b/3.0/modules/about_this_photo/views/about_this_photo.html.php
@@ -16,14 +16,14 @@
     <td><?= $vcount ?></td>
 </tr>
 <tr>
-    <td><strong class="caption"><?= t("Image ID:&nbsp;") ?></strong></td>
-    <td><?= $source ?></td>
+    <td><strong class="caption"><?= t("Name:&nbsp;") ?></strong></td>
+    <td><?= $name ?></td>
 </tr>
 </table>
-  <span >
+  <div style="margin-top: 10px; margin-bottom: 10px;">
     <strong class="caption"><?= t("Caption:&nbsp;") ?></strong>
     <?= $caption ?>
-  </span ><br>
+  </div >
   <span >
     <strong class=="caption"><?= t("Tags: &nbsp;&nbsp;") ?></strong>
     <? foreach ($tags as $tag): ?>
diff --git a/3.1/modules/about_this_album/helpers/about_this_album_block.php b/3.1/modules/about_this_album/helpers/about_this_album_block.php
new file mode 100644
index 00000000..a2a849e5
--- /dev/null
+++ b/3.1/modules/about_this_album/helpers/about_this_album_block.php
@@ -0,0 +1,76 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2010 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class about_this_album_block_Core {
+
+  static function get_site_list() {
+    return array("aboutthisalbum" => t("About This Album"));
+  }
+
+  static function get($block_id, $theme) {
+    switch ($block_id) {
+    case "aboutthisalbum":
+      $item = $theme->item;
+ 	  if ((!$item) or (!$theme->item->is_album())) {
+        return ""; 
+	  }
+      if ($theme->item->is_album()) {
+        $block = new Block();
+	    $block->css_id = "g-about-this-album";
+	    $block->content = new View("about_this_album.html");
+
+ 	    if ($theme->item()->id == item::root()->id) {
+		  $block->title = t("About this Site");
+		  $block->content->album_count = ORM::factory("item")->where("type", "=", "album")->where("id", "<>", 1)->count_all();
+          $block->content->photo_count = ORM::factory("item")->where("type", "=", "photo")->count_all();
+          $block->content->vcount = Database::instance()->query("SELECT SUM({items}.view_count) as c FROM {items} WHERE type=\"photo\"")->current()->c;
+		} Else {
+           $block->title = t("About this Album");
+           $block->content->album_count = $item->descendants_count(array(array("type", "=", "album"))); 
+           $block->content->photo_count = $item->descendants_count(array(array("type", "=", "photo"))); 
+  	       // $block->content->vcount= $theme->item()->view_count; 
+  	       $descds = $item->descendants();
+		   $descds_view = 0;
+		   foreach ($descds as $descd) {
+		     if ($descd->is_photo()) {
+		       $descds_view += $descd->view_count;
+			 }
+		   }
+		   $block->content->vcount = $descds_view;
+          if ($item->description) {
+            $block->content->description = html::clean($item->description);
+          }
+		}
+
+
+        $all_tags = ORM::factory("tag")
+        ->join("items_tags", "items_tags.tag_id", "tags.id")
+        ->join("items", "items.id", "items_tags.item_id", "LEFT")
+        ->where("items.parent_id", "=", $item->id)
+        ->order_by("tags.id", "ASC")
+        ->find_all();
+        if (count($all_tags) > 0) {
+         $block->content->all_tags = $all_tags;
+        }
+	  }
+      break;
+    }
+    return $block;
+  }
+}
diff --git a/3.1/modules/about_this_album/module.info b/3.1/modules/about_this_album/module.info
new file mode 100644
index 00000000..8080a24d
--- /dev/null
+++ b/3.1/modules/about_this_album/module.info
@@ -0,0 +1,3 @@
+name = "About this Album"
+description = "Show some simple, specific and useful info about a given album"
+version = 1
diff --git a/3.1/modules/about_this_album/views/about_this_album.html.php b/3.1/modules/about_this_album/views/about_this_album.html.php
new file mode 100644
index 00000000..01dee4f7
--- /dev/null
+++ b/3.1/modules/about_this_album/views/about_this_album.html.php
@@ -0,0 +1,68 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<? date_default_timezone_set('Australia/ACT'); ?> 
+<div class="g-metadata">
+<span class="g-about-this">
+<table cellspacing="0" cellpadding="0" border="0">
+<? if ($album_count > 0): ?>
+  <tr>
+    <td><strong class="caption"><?= t("Albums:&nbsp;") ?></strong></td>
+    <td><?= $album_count ?></td>
+  </tr>
+<? endif ?>
+  <tr>
+    <td><strong class="caption"><?= t("Images:&nbsp;") ?></strong></td>
+    <td><?= $photo_count ?></td>
+  </tr>
+  <tr>
+    <td><strong class="caption"><?= t("Views:&nbsp;") ?></strong></td>
+    <td><?= $vcount ?></td>
+  </tr>
+</table>
+  <span >
+  
+  <!--This Div will insert a margin either side of the desciption if there are tags to display-->
+  <? if (count($all_tags) > 0): ?>
+	<div style="margin-top: 10px; margin-bottom: 10px;">
+  <? endif ?>
+
+  <? if ($description <> ""): ?>
+	<strong class="caption"><?= t("Details:&nbsp;") ?></strong>
+    <?= $description ?>
+  </span ><br>
+  <? endif ?>
+  
+    <? if (count($all_tags) > 0): ?>
+	</div>
+  <span >
+      <strong class=="caption"><?= t("Tags:&nbsp;") ?></strong>
+  </span >
+  <?
+  // Create an array to store the tag names and urls in.
+  $display_tags = array();  
+  
+  // Loop through all tags in the album, copying their
+  //   names and urls into the array and skipping duplicates.
+  $last_tagid = "";
+  foreach ($all_tags as $one_tag) {
+    if ($last_tagid != $one_tag->id) {
+      $tag = ORM::factory("tag", $one_tag->id);
+      $display_tags[] = array(html::clean($tag->name), $tag->url());
+      $last_tagid = $one_tag->id;
+    }
+  }
+  
+  // Sort the array.
+  asort($display_tags);
+  
+  // Print out the list of tags as clickable links.
+  $not_first = 0;
+  foreach ($display_tags as $one_tag) {
+    if ($not_first++ > 0) {
+      print ", ";
+    }
+    print "<a href=\"" . $one_tag[1] . "\">" . $one_tag[0] . "</a>";
+  }
+?>
+<? endif ?>
+</span>
+</div>
diff --git a/3.1/modules/about_this_photo/helpers/about_this_photo_block.php b/3.1/modules/about_this_photo/helpers/about_this_photo_block.php
index 86869844..808d19bd 100644
--- a/3.1/modules/about_this_photo/helpers/about_this_photo_block.php
+++ b/3.1/modules/about_this_photo/helpers/about_this_photo_block.php
@@ -54,7 +54,7 @@ class about_this_photo_block_Core {
 	    $record = ORM::factory("iptc_record")->where("item_id", "=", $theme->item()->id)->find();
    	    if ($record->loaded()) {
           $record = unserialize($record->data);
-          $block->content->source = $record["Source"];
+          $block->content->name = $record["ObjectName"];
           $block->content->caption = $record["Caption"];
 		  
   	    }
diff --git a/3.1/modules/about_this_photo/module.info b/3.1/modules/about_this_photo/module.info
index 632c0f05..e324ae3b 100644
--- a/3.1/modules/about_this_photo/module.info
+++ b/3.1/modules/about_this_photo/module.info
@@ -1,3 +1,3 @@
 name = "About this Photo"
 description = "Show some simple, specific and useful info about a given photo"
-version = 2
+version = 3
diff --git a/3.1/modules/about_this_photo/views/about_this_photo.html.php b/3.1/modules/about_this_photo/views/about_this_photo.html.php
index 45db0274..f0ef130a 100644
--- a/3.1/modules/about_this_photo/views/about_this_photo.html.php
+++ b/3.1/modules/about_this_photo/views/about_this_photo.html.php
@@ -16,14 +16,14 @@
     <td><?= $vcount ?></td>
 </tr>
 <tr>
-    <td><strong class="caption"><?= t("Image ID:&nbsp;") ?></strong></td>
-    <td><?= $source ?></td>
+    <td><strong class="caption"><?= t("Name:&nbsp;") ?></strong></td>
+    <td><?= $name ?></td>
 </tr>
 </table>
-  <span >
+  <div style="margin-top: 10px; margin-bottom: 10px;">
     <strong class="caption"><?= t("Caption:&nbsp;") ?></strong>
     <?= $caption ?>
-  </span ><br>
+  </div >
   <span >
     <strong class=="caption"><?= t("Tags: &nbsp;&nbsp;") ?></strong>
     <? foreach ($tags as $tag): ?>

From 7904946b54b9444e4107338f3e746d8daef9f968 Mon Sep 17 00:00:00 2001
From: dmolavi <dmolavi@gmail.com>
Date: Sat, 8 Jan 2011 20:16:32 -0500
Subject: [PATCH 05/10] Oops, forgot to bump version number.

---
 3.0/modules/ecard/helpers/ecard_installer.php | 2 +-
 3.0/modules/ecard/module.info                 | 2 +-
 3.1/modules/ecard/helpers/ecard_installer.php | 2 +-
 3.1/modules/ecard/module.info                 | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/3.0/modules/ecard/helpers/ecard_installer.php b/3.0/modules/ecard/helpers/ecard_installer.php
index d9887094..a9a6934f 100644
--- a/3.0/modules/ecard/helpers/ecard_installer.php
+++ b/3.0/modules/ecard/helpers/ecard_installer.php
@@ -25,6 +25,6 @@ class ecard_installer {
                     "Click the image to be taken to the gallery.");
     module::set_var("ecard", "bcc", "");
     module::set_var("ecard", "access_permissions", "everybody");
-    module::set_version("ecard", 4);
+    module::set_version("ecard", 5);
   }
 }
diff --git a/3.0/modules/ecard/module.info b/3.0/modules/ecard/module.info
index 95c8f6a4..407ebd68 100644
--- a/3.0/modules/ecard/module.info
+++ b/3.0/modules/ecard/module.info
@@ -1,4 +1,4 @@
 name = "E-Card"
 description = "Send a photo as a postcard"
-version = 4
+version = 5
 
diff --git a/3.1/modules/ecard/helpers/ecard_installer.php b/3.1/modules/ecard/helpers/ecard_installer.php
index d9887094..a9a6934f 100644
--- a/3.1/modules/ecard/helpers/ecard_installer.php
+++ b/3.1/modules/ecard/helpers/ecard_installer.php
@@ -25,6 +25,6 @@ class ecard_installer {
                     "Click the image to be taken to the gallery.");
     module::set_var("ecard", "bcc", "");
     module::set_var("ecard", "access_permissions", "everybody");
-    module::set_version("ecard", 4);
+    module::set_version("ecard", 5);
   }
 }
diff --git a/3.1/modules/ecard/module.info b/3.1/modules/ecard/module.info
index 95c8f6a4..407ebd68 100644
--- a/3.1/modules/ecard/module.info
+++ b/3.1/modules/ecard/module.info
@@ -1,4 +1,4 @@
 name = "E-Card"
 description = "Send a photo as a postcard"
-version = 4
+version = 5
 

From 2c9a045ad909462194514bda21bd4bc194b88a58 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 8 Jan 2011 18:37:52 -0800
Subject: [PATCH 06/10] Move the HTMLPurifier code from lib to vendor to be
 compliant with our packaging structure

---
 3.0/modules/purifier/helpers/purifier.php           |   2 +-
 .../HTMLPurifier/HTMLPurifier.auto.php              |   0
 .../HTMLPurifier/HTMLPurifier.autoload.php          |   0
 .../HTMLPurifier/HTMLPurifier.func.php              |   0
 .../HTMLPurifier/HTMLPurifier.includes.php          |   0
 .../HTMLPurifier/HTMLPurifier.kses.php              |   0
 .../HTMLPurifier/HTMLPurifier.path.php              |   0
 .../{lib => vendor}/HTMLPurifier/HTMLPurifier.php   |   0
 .../HTMLPurifier/HTMLPurifier.safe-includes.php     |   0
 .../HTMLPurifier/HTMLPurifier/AttrCollections.php   |   0
 .../HTMLPurifier/HTMLPurifier/AttrDef.php           |   0
 .../HTMLPurifier/HTMLPurifier/AttrDef/CSS.php       |   0
 .../HTMLPurifier/AttrDef/CSS/AlphaValue.php         |   0
 .../HTMLPurifier/AttrDef/CSS/Background.php         |   0
 .../HTMLPurifier/AttrDef/CSS/BackgroundPosition.php |   0
 .../HTMLPurifier/AttrDef/CSS/Border.php             |   0
 .../HTMLPurifier/HTMLPurifier/AttrDef/CSS/Color.php |   0
 .../HTMLPurifier/AttrDef/CSS/Composite.php          |   0
 .../AttrDef/CSS/DenyElementDecorator.php            |   0
 .../HTMLPurifier/AttrDef/CSS/Filter.php             |   0
 .../HTMLPurifier/HTMLPurifier/AttrDef/CSS/Font.php  |   0
 .../HTMLPurifier/AttrDef/CSS/FontFamily.php         |   0
 .../HTMLPurifier/AttrDef/CSS/ImportantDecorator.php |   0
 .../HTMLPurifier/AttrDef/CSS/Length.php             |   0
 .../HTMLPurifier/AttrDef/CSS/ListStyle.php          |   0
 .../HTMLPurifier/AttrDef/CSS/Multiple.php           |   0
 .../HTMLPurifier/AttrDef/CSS/Number.php             |   0
 .../HTMLPurifier/AttrDef/CSS/Percentage.php         |   0
 .../HTMLPurifier/AttrDef/CSS/TextDecoration.php     |   0
 .../HTMLPurifier/HTMLPurifier/AttrDef/CSS/URI.php   |   0
 .../HTMLPurifier/HTMLPurifier/AttrDef/Enum.php      |   0
 .../HTMLPurifier/HTMLPurifier/AttrDef/HTML/Bool.php |   0
 .../HTMLPurifier/AttrDef/HTML/Class.php             |   0
 .../HTMLPurifier/AttrDef/HTML/Color.php             |   0
 .../HTMLPurifier/AttrDef/HTML/FrameTarget.php       |   0
 .../HTMLPurifier/HTMLPurifier/AttrDef/HTML/ID.php   |   0
 .../HTMLPurifier/AttrDef/HTML/Length.php            |   0
 .../HTMLPurifier/AttrDef/HTML/LinkTypes.php         |   0
 .../HTMLPurifier/AttrDef/HTML/MultiLength.php       |   0
 .../HTMLPurifier/AttrDef/HTML/Nmtokens.php          |   0
 .../HTMLPurifier/AttrDef/HTML/Pixels.php            |   0
 .../HTMLPurifier/HTMLPurifier/AttrDef/Integer.php   |   0
 .../HTMLPurifier/HTMLPurifier/AttrDef/Lang.php      |   0
 .../HTMLPurifier/HTMLPurifier/AttrDef/Switch.php    |   0
 .../HTMLPurifier/HTMLPurifier/AttrDef/Text.php      |   0
 .../HTMLPurifier/HTMLPurifier/AttrDef/URI.php       |   0
 .../HTMLPurifier/HTMLPurifier/AttrDef/URI/Email.php |   0
 .../HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php  |   0
 .../HTMLPurifier/HTMLPurifier/AttrDef/URI/Host.php  |   0
 .../HTMLPurifier/HTMLPurifier/AttrDef/URI/IPv4.php  |   0
 .../HTMLPurifier/HTMLPurifier/AttrDef/URI/IPv6.php  |   0
 .../HTMLPurifier/HTMLPurifier/AttrTransform.php     |   0
 .../HTMLPurifier/AttrTransform/Background.php       |   0
 .../HTMLPurifier/AttrTransform/BdoDir.php           |   0
 .../HTMLPurifier/AttrTransform/BgColor.php          |   0
 .../HTMLPurifier/AttrTransform/BoolToCSS.php        |   0
 .../HTMLPurifier/AttrTransform/Border.php           |   0
 .../HTMLPurifier/AttrTransform/EnumToCSS.php        |   0
 .../HTMLPurifier/AttrTransform/ImgRequired.php      |   0
 .../HTMLPurifier/AttrTransform/ImgSpace.php         |   0
 .../HTMLPurifier/AttrTransform/Input.php            |   0
 .../HTMLPurifier/AttrTransform/Lang.php             |   0
 .../HTMLPurifier/AttrTransform/Length.php           |   0
 .../HTMLPurifier/AttrTransform/Name.php             |   0
 .../HTMLPurifier/AttrTransform/NameSync.php         |   0
 .../HTMLPurifier/AttrTransform/SafeEmbed.php        |   0
 .../HTMLPurifier/AttrTransform/SafeObject.php       |   0
 .../HTMLPurifier/AttrTransform/SafeParam.php        |   0
 .../HTMLPurifier/AttrTransform/ScriptRequired.php   |   0
 .../HTMLPurifier/AttrTransform/Textarea.php         |   0
 .../HTMLPurifier/HTMLPurifier/AttrTypes.php         |   0
 .../HTMLPurifier/HTMLPurifier/AttrValidator.php     |   0
 .../HTMLPurifier/HTMLPurifier/Bootstrap.php         |   0
 .../HTMLPurifier/HTMLPurifier/CSSDefinition.php     |   0
 .../HTMLPurifier/HTMLPurifier/ChildDef.php          |   0
 .../HTMLPurifier/ChildDef/Chameleon.php             |   0
 .../HTMLPurifier/HTMLPurifier/ChildDef/Custom.php   |   0
 .../HTMLPurifier/HTMLPurifier/ChildDef/Empty.php    |   0
 .../HTMLPurifier/HTMLPurifier/ChildDef/Optional.php |   0
 .../HTMLPurifier/HTMLPurifier/ChildDef/Required.php |   0
 .../HTMLPurifier/ChildDef/StrictBlockquote.php      |   0
 .../HTMLPurifier/HTMLPurifier/ChildDef/Table.php    |   0
 .../HTMLPurifier/HTMLPurifier/Config.php            |   0
 .../HTMLPurifier/HTMLPurifier/ConfigSchema.php      |   0
 .../ConfigSchema/Builder/ConfigSchema.php           |   0
 .../HTMLPurifier/ConfigSchema/Builder/Xml.php       |   0
 .../HTMLPurifier/ConfigSchema/Exception.php         |   0
 .../HTMLPurifier/ConfigSchema/Interchange.php       |   0
 .../ConfigSchema/Interchange/Directive.php          |   0
 .../HTMLPurifier/ConfigSchema/Interchange/Id.php    |   0
 .../ConfigSchema/InterchangeBuilder.php             |   0
 .../HTMLPurifier/ConfigSchema/Validator.php         |   0
 .../HTMLPurifier/ConfigSchema/ValidatorAtom.php     |   0
 .../HTMLPurifier/ConfigSchema/schema.ser            | Bin
 .../ConfigSchema/schema/Attr.AllowedClasses.txt     |   0
 .../schema/Attr.AllowedFrameTargets.txt             |   0
 .../ConfigSchema/schema/Attr.AllowedRel.txt         |   0
 .../ConfigSchema/schema/Attr.AllowedRev.txt         |   0
 .../ConfigSchema/schema/Attr.ClassUseCDATA.txt      |   0
 .../ConfigSchema/schema/Attr.DefaultImageAlt.txt    |   0
 .../schema/Attr.DefaultInvalidImage.txt             |   0
 .../schema/Attr.DefaultInvalidImageAlt.txt          |   0
 .../ConfigSchema/schema/Attr.DefaultTextDir.txt     |   0
 .../ConfigSchema/schema/Attr.EnableID.txt           |   0
 .../ConfigSchema/schema/Attr.ForbiddenClasses.txt   |   0
 .../ConfigSchema/schema/Attr.IDBlacklist.txt        |   0
 .../ConfigSchema/schema/Attr.IDBlacklistRegexp.txt  |   0
 .../ConfigSchema/schema/Attr.IDPrefix.txt           |   0
 .../ConfigSchema/schema/Attr.IDPrefixLocal.txt      |   0
 .../schema/AutoFormat.AutoParagraph.txt             |   0
 .../ConfigSchema/schema/AutoFormat.Custom.txt       |   0
 .../schema/AutoFormat.DisplayLinkURI.txt            |   0
 .../ConfigSchema/schema/AutoFormat.Linkify.txt      |   0
 .../schema/AutoFormat.PurifierLinkify.DocURL.txt    |   0
 .../schema/AutoFormat.PurifierLinkify.txt           |   0
 ...AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions.txt |   0
 .../schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt    |   0
 .../ConfigSchema/schema/AutoFormat.RemoveEmpty.txt  |   0
 .../ConfigSchema/schema/CSS.AllowImportant.txt      |   0
 .../ConfigSchema/schema/CSS.AllowTricky.txt         |   0
 .../ConfigSchema/schema/CSS.AllowedProperties.txt   |   0
 .../ConfigSchema/schema/CSS.DefinitionRev.txt       |   0
 .../ConfigSchema/schema/CSS.MaxImgLength.txt        |   0
 .../ConfigSchema/schema/CSS.Proprietary.txt         |   0
 .../ConfigSchema/schema/Cache.DefinitionImpl.txt    |   0
 .../ConfigSchema/schema/Cache.SerializerPath.txt    |   0
 .../ConfigSchema/schema/Core.AggressivelyFixLt.txt  |   0
 .../ConfigSchema/schema/Core.CollectErrors.txt      |   0
 .../ConfigSchema/schema/Core.ColorKeywords.txt      |   0
 .../schema/Core.ConvertDocumentToFragment.txt       |   0
 .../schema/Core.DirectLexLineNumberSyncInterval.txt |   0
 .../ConfigSchema/schema/Core.Encoding.txt           |   0
 .../schema/Core.EscapeInvalidChildren.txt           |   0
 .../ConfigSchema/schema/Core.EscapeInvalidTags.txt  |   0
 .../schema/Core.EscapeNonASCIICharacters.txt        |   0
 .../ConfigSchema/schema/Core.HiddenElements.txt     |   0
 .../ConfigSchema/schema/Core.Language.txt           |   0
 .../ConfigSchema/schema/Core.LexerImpl.txt          |   0
 .../schema/Core.MaintainLineNumbers.txt             |   0
 .../ConfigSchema/schema/Core.RemoveInvalidImg.txt   |   0
 .../schema/Core.RemoveScriptContents.txt            |   0
 .../ConfigSchema/schema/Filter.Custom.txt           |   0
 .../schema/Filter.ExtractStyleBlocks.Escaping.txt   |   0
 .../schema/Filter.ExtractStyleBlocks.Scope.txt      |   0
 .../schema/Filter.ExtractStyleBlocks.TidyImpl.txt   |   0
 .../schema/Filter.ExtractStyleBlocks.txt            |   0
 .../ConfigSchema/schema/Filter.YouTube.txt          |   0
 .../ConfigSchema/schema/HTML.Allowed.txt            |   0
 .../ConfigSchema/schema/HTML.AllowedAttributes.txt  |   0
 .../ConfigSchema/schema/HTML.AllowedElements.txt    |   0
 .../ConfigSchema/schema/HTML.AllowedModules.txt     |   0
 .../ConfigSchema/schema/HTML.Attr.Name.UseCDATA.txt |   0
 .../ConfigSchema/schema/HTML.BlockWrapper.txt       |   0
 .../ConfigSchema/schema/HTML.CoreModules.txt        |   0
 .../ConfigSchema/schema/HTML.CustomDoctype.txt      |   0
 .../ConfigSchema/schema/HTML.DefinitionID.txt       |   0
 .../ConfigSchema/schema/HTML.DefinitionRev.txt      |   0
 .../ConfigSchema/schema/HTML.Doctype.txt            |   0
 .../schema/HTML.ForbiddenAttributes.txt             |   0
 .../ConfigSchema/schema/HTML.ForbiddenElements.txt  |   0
 .../ConfigSchema/schema/HTML.MaxImgLength.txt       |   0
 .../ConfigSchema/schema/HTML.Parent.txt             |   0
 .../ConfigSchema/schema/HTML.Proprietary.txt        |   0
 .../ConfigSchema/schema/HTML.SafeEmbed.txt          |   0
 .../ConfigSchema/schema/HTML.SafeObject.txt         |   0
 .../ConfigSchema/schema/HTML.Strict.txt             |   0
 .../ConfigSchema/schema/HTML.TidyAdd.txt            |   0
 .../ConfigSchema/schema/HTML.TidyLevel.txt          |   0
 .../ConfigSchema/schema/HTML.TidyRemove.txt         |   0
 .../ConfigSchema/schema/HTML.Trusted.txt            |   0
 .../HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt |   0
 .../schema/Output.CommentScriptContents.txt         |   0
 .../ConfigSchema/schema/Output.Newline.txt          |   0
 .../ConfigSchema/schema/Output.SortAttr.txt         |   0
 .../ConfigSchema/schema/Output.TidyFormat.txt       |   0
 .../ConfigSchema/schema/Test.ForceNoIconv.txt       |   0
 .../ConfigSchema/schema/URI.AllowedSchemes.txt      |   0
 .../HTMLPurifier/ConfigSchema/schema/URI.Base.txt   |   0
 .../ConfigSchema/schema/URI.DefaultScheme.txt       |   0
 .../ConfigSchema/schema/URI.DefinitionID.txt        |   0
 .../ConfigSchema/schema/URI.DefinitionRev.txt       |   0
 .../ConfigSchema/schema/URI.Disable.txt             |   0
 .../ConfigSchema/schema/URI.DisableExternal.txt     |   0
 .../schema/URI.DisableExternalResources.txt         |   0
 .../ConfigSchema/schema/URI.DisableResources.txt    |   0
 .../HTMLPurifier/ConfigSchema/schema/URI.Host.txt   |   0
 .../ConfigSchema/schema/URI.HostBlacklist.txt       |   0
 .../ConfigSchema/schema/URI.MakeAbsolute.txt        |   0
 .../HTMLPurifier/ConfigSchema/schema/URI.Munge.txt  |   0
 .../ConfigSchema/schema/URI.MungeResources.txt      |   0
 .../ConfigSchema/schema/URI.MungeSecretKey.txt      |   0
 .../schema/URI.OverrideAllowedSchemes.txt           |   0
 .../HTMLPurifier/ConfigSchema/schema/info.ini       |   0
 .../HTMLPurifier/HTMLPurifier/ContentSets.php       |   0
 .../HTMLPurifier/HTMLPurifier/Context.php           |   0
 .../HTMLPurifier/HTMLPurifier/Definition.php        |   0
 .../HTMLPurifier/HTMLPurifier/DefinitionCache.php   |   0
 .../HTMLPurifier/DefinitionCache/Decorator.php      |   0
 .../DefinitionCache/Decorator/Cleanup.php           |   0
 .../DefinitionCache/Decorator/Memory.php            |   0
 .../DefinitionCache/Decorator/Template.php.in       |   0
 .../HTMLPurifier/DefinitionCache/Null.php           |   0
 .../HTMLPurifier/DefinitionCache/Serializer.php     |   0
 .../HTMLPurifier/DefinitionCache/Serializer/README  |   0
 .../HTMLPurifier/DefinitionCacheFactory.php         |   0
 .../HTMLPurifier/HTMLPurifier/Doctype.php           |   0
 .../HTMLPurifier/HTMLPurifier/DoctypeRegistry.php   |   0
 .../HTMLPurifier/HTMLPurifier/ElementDef.php        |   0
 .../HTMLPurifier/HTMLPurifier/Encoder.php           |   0
 .../HTMLPurifier/HTMLPurifier/EntityLookup.php      |   0
 .../HTMLPurifier/EntityLookup/entities.ser          |   0
 .../HTMLPurifier/HTMLPurifier/EntityParser.php      |   0
 .../HTMLPurifier/HTMLPurifier/ErrorCollector.php    |   0
 .../HTMLPurifier/HTMLPurifier/ErrorStruct.php       |   0
 .../HTMLPurifier/HTMLPurifier/Exception.php         |   0
 .../HTMLPurifier/HTMLPurifier/Filter.php            |   0
 .../HTMLPurifier/Filter/ExtractStyleBlocks.php      |   0
 .../HTMLPurifier/HTMLPurifier/Filter/YouTube.php    |   0
 .../HTMLPurifier/HTMLPurifier/Generator.php         |   0
 .../HTMLPurifier/HTMLPurifier/HTMLDefinition.php    |   0
 .../HTMLPurifier/HTMLPurifier/HTMLModule.php        |   0
 .../HTMLPurifier/HTMLPurifier/HTMLModule/Bdo.php    |   0
 .../HTMLPurifier/HTMLModule/CommonAttributes.php    |   0
 .../HTMLPurifier/HTMLPurifier/HTMLModule/Edit.php   |   0
 .../HTMLPurifier/HTMLPurifier/HTMLModule/Forms.php  |   0
 .../HTMLPurifier/HTMLModule/Hypertext.php           |   0
 .../HTMLPurifier/HTMLPurifier/HTMLModule/Image.php  |   0
 .../HTMLPurifier/HTMLPurifier/HTMLModule/Legacy.php |   0
 .../HTMLPurifier/HTMLPurifier/HTMLModule/List.php   |   0
 .../HTMLPurifier/HTMLPurifier/HTMLModule/Name.php   |   0
 .../HTMLModule/NonXMLCommonAttributes.php           |   0
 .../HTMLPurifier/HTMLPurifier/HTMLModule/Object.php |   0
 .../HTMLPurifier/HTMLModule/Presentation.php        |   0
 .../HTMLPurifier/HTMLModule/Proprietary.php         |   0
 .../HTMLPurifier/HTMLPurifier/HTMLModule/Ruby.php   |   0
 .../HTMLPurifier/HTMLModule/SafeEmbed.php           |   0
 .../HTMLPurifier/HTMLModule/SafeObject.php          |   0
 .../HTMLPurifier/HTMLModule/Scripting.php           |   0
 .../HTMLPurifier/HTMLModule/StyleAttribute.php      |   0
 .../HTMLPurifier/HTMLPurifier/HTMLModule/Tables.php |   0
 .../HTMLPurifier/HTMLPurifier/HTMLModule/Target.php |   0
 .../HTMLPurifier/HTMLPurifier/HTMLModule/Text.php   |   0
 .../HTMLPurifier/HTMLPurifier/HTMLModule/Tidy.php   |   0
 .../HTMLPurifier/HTMLModule/Tidy/Name.php           |   0
 .../HTMLPurifier/HTMLModule/Tidy/Proprietary.php    |   0
 .../HTMLPurifier/HTMLModule/Tidy/Strict.php         |   0
 .../HTMLPurifier/HTMLModule/Tidy/Transitional.php   |   0
 .../HTMLPurifier/HTMLModule/Tidy/XHTML.php          |   0
 .../HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php  |   0
 .../HTMLPurifier/HTMLModule/XMLCommonAttributes.php |   0
 .../HTMLPurifier/HTMLPurifier/HTMLModuleManager.php |   0
 .../HTMLPurifier/HTMLPurifier/IDAccumulator.php     |   0
 .../HTMLPurifier/HTMLPurifier/Injector.php          |   0
 .../HTMLPurifier/Injector/AutoParagraph.php         |   0
 .../HTMLPurifier/Injector/DisplayLinkURI.php        |   0
 .../HTMLPurifier/HTMLPurifier/Injector/Linkify.php  |   0
 .../HTMLPurifier/Injector/PurifierLinkify.php       |   0
 .../HTMLPurifier/Injector/RemoveEmpty.php           |   0
 .../HTMLPurifier/Injector/SafeObject.php            |   0
 .../HTMLPurifier/HTMLPurifier/Language.php          |   0
 .../HTMLPurifier/Language/classes/en-x-test.php     |   0
 .../HTMLPurifier/Language/messages/en-x-test.php    |   0
 .../Language/messages/en-x-testmini.php             |   0
 .../HTMLPurifier/Language/messages/en.php           |   0
 .../HTMLPurifier/HTMLPurifier/LanguageFactory.php   |   0
 .../HTMLPurifier/HTMLPurifier/Length.php            |   0
 .../HTMLPurifier/HTMLPurifier/Lexer.php             |   0
 .../HTMLPurifier/HTMLPurifier/Lexer/DOMLex.php      |   0
 .../HTMLPurifier/HTMLPurifier/Lexer/DirectLex.php   |   0
 .../HTMLPurifier/HTMLPurifier/Lexer/PEARSax3.php    |   0
 .../HTMLPurifier/HTMLPurifier/Lexer/PH5P.php        |   0
 .../HTMLPurifier/HTMLPurifier/PercentEncoder.php    |   0
 .../HTMLPurifier/HTMLPurifier/Printer.php           |   0
 .../HTMLPurifier/Printer/CSSDefinition.php          |   0
 .../HTMLPurifier/Printer/ConfigForm.css             |   0
 .../HTMLPurifier/HTMLPurifier/Printer/ConfigForm.js |   0
 .../HTMLPurifier/Printer/ConfigForm.php             |   0
 .../HTMLPurifier/Printer/HTMLDefinition.php         |   0
 .../HTMLPurifier/HTMLPurifier/PropertyList.php      |   0
 .../HTMLPurifier/PropertyListIterator.php           |   0
 .../HTMLPurifier/HTMLPurifier/Strategy.php          |   0
 .../HTMLPurifier/Strategy/Composite.php             |   0
 .../HTMLPurifier/HTMLPurifier/Strategy/Core.php     |   0
 .../HTMLPurifier/Strategy/FixNesting.php            |   0
 .../HTMLPurifier/Strategy/MakeWellFormed.php        |   0
 .../HTMLPurifier/Strategy/RemoveForeignElements.php |   0
 .../HTMLPurifier/Strategy/ValidateAttributes.php    |   0
 .../HTMLPurifier/HTMLPurifier/StringHash.php        |   0
 .../HTMLPurifier/HTMLPurifier/StringHashParser.php  |   0
 .../HTMLPurifier/HTMLPurifier/TagTransform.php      |   0
 .../HTMLPurifier/HTMLPurifier/TagTransform/Font.php |   0
 .../HTMLPurifier/TagTransform/Simple.php            |   0
 .../HTMLPurifier/HTMLPurifier/Token.php             |   0
 .../HTMLPurifier/HTMLPurifier/Token/Comment.php     |   0
 .../HTMLPurifier/HTMLPurifier/Token/Empty.php       |   0
 .../HTMLPurifier/HTMLPurifier/Token/End.php         |   0
 .../HTMLPurifier/HTMLPurifier/Token/Start.php       |   0
 .../HTMLPurifier/HTMLPurifier/Token/Tag.php         |   0
 .../HTMLPurifier/HTMLPurifier/Token/Text.php        |   0
 .../HTMLPurifier/HTMLPurifier/TokenFactory.php      |   0
 .../HTMLPurifier/HTMLPurifier/URI.php               |   0
 .../HTMLPurifier/HTMLPurifier/URIDefinition.php     |   0
 .../HTMLPurifier/HTMLPurifier/URIFilter.php         |   0
 .../HTMLPurifier/URIFilter/DisableExternal.php      |   0
 .../URIFilter/DisableExternalResources.php          |   0
 .../HTMLPurifier/URIFilter/HostBlacklist.php        |   0
 .../HTMLPurifier/URIFilter/MakeAbsolute.php         |   0
 .../HTMLPurifier/HTMLPurifier/URIFilter/Munge.php   |   0
 .../HTMLPurifier/HTMLPurifier/URIParser.php         |   0
 .../HTMLPurifier/HTMLPurifier/URIScheme.php         |   0
 .../HTMLPurifier/HTMLPurifier/URIScheme/ftp.php     |   0
 .../HTMLPurifier/HTMLPurifier/URIScheme/http.php    |   0
 .../HTMLPurifier/HTMLPurifier/URIScheme/https.php   |   0
 .../HTMLPurifier/HTMLPurifier/URIScheme/mailto.php  |   0
 .../HTMLPurifier/HTMLPurifier/URIScheme/news.php    |   0
 .../HTMLPurifier/HTMLPurifier/URIScheme/nntp.php    |   0
 .../HTMLPurifier/HTMLPurifier/URISchemeRegistry.php |   0
 .../HTMLPurifier/HTMLPurifier/UnitConverter.php     |   0
 .../HTMLPurifier/HTMLPurifier/VarParser.php         |   0
 .../HTMLPurifier/VarParser/Flexible.php             |   0
 .../HTMLPurifier/HTMLPurifier/VarParser/Native.php  |   0
 .../HTMLPurifier/VarParserException.php             |   0
 .../HTMLPurifier/HTMLPurifierLicense                |   0
 323 files changed, 1 insertion(+), 1 deletion(-)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier.auto.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier.autoload.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier.func.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier.includes.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier.kses.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier.path.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier.safe-includes.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrCollections.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/CSS.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/CSS/AlphaValue.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Background.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Border.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Color.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Composite.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Filter.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Font.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/CSS/FontFamily.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Length.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/CSS/ListStyle.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Multiple.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Number.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Percentage.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/CSS/TextDecoration.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/CSS/URI.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/Enum.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Bool.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Class.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Color.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/HTML/FrameTarget.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/HTML/ID.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Length.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/HTML/LinkTypes.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/HTML/MultiLength.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Nmtokens.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Pixels.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/Integer.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/Lang.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/Switch.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/Text.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/URI.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/URI/Email.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/URI/Host.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/URI/IPv4.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/URI/IPv6.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrTransform.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrTransform/Background.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrTransform/BdoDir.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrTransform/BgColor.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrTransform/BoolToCSS.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrTransform/Border.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrTransform/EnumToCSS.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrTransform/ImgRequired.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrTransform/ImgSpace.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrTransform/Input.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrTransform/Lang.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrTransform/Length.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrTransform/Name.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrTransform/NameSync.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrTransform/SafeEmbed.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrTransform/SafeObject.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrTransform/SafeParam.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrTransform/ScriptRequired.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrTransform/Textarea.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrTypes.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrValidator.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Bootstrap.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/CSSDefinition.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ChildDef.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ChildDef/Chameleon.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ChildDef/Custom.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ChildDef/Empty.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ChildDef/Optional.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ChildDef/Required.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ChildDef/StrictBlockquote.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ChildDef/Table.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Config.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/Builder/Xml.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/Exception.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/Interchange.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/Interchange/Directive.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/Interchange/Id.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/InterchangeBuilder.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/Validator.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/ValidatorAtom.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema.ser (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.AllowedClasses.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.ClassUseCDATA.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.DefaultImageAlt.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.ForbiddenClasses.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.DisplayLinkURI.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.DocURL.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.AllowImportant.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.AllowTricky.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.Language.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.Custom.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Escaping.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Scope.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.TidyImpl.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Attr.Name.UseCDATA.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenAttributes.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenElements.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.SortAttr.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.Base.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.Host.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.MungeResources.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/info.ini (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ContentSets.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Context.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Definition.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/DefinitionCache.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/DefinitionCache/Decorator.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/DefinitionCache/Decorator/Memory.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/DefinitionCache/Decorator/Template.php.in (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/DefinitionCache/Null.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/DefinitionCache/Serializer.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/DefinitionCache/Serializer/README (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/DefinitionCacheFactory.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Doctype.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/DoctypeRegistry.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ElementDef.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Encoder.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/EntityLookup.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/EntityLookup/entities.ser (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/EntityParser.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ErrorCollector.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ErrorStruct.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Exception.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Filter.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Filter/ExtractStyleBlocks.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Filter/YouTube.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Generator.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLDefinition.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModule.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModule/Bdo.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModule/CommonAttributes.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModule/Edit.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModule/Forms.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModule/Hypertext.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModule/Image.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModule/Legacy.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModule/List.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModule/Name.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModule/Object.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModule/Presentation.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModule/Proprietary.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModule/Ruby.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModule/SafeEmbed.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModule/SafeObject.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModule/Scripting.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModule/StyleAttribute.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModule/Tables.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModule/Target.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModule/Text.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Name.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Proprietary.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Strict.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Transitional.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/XHTML.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModule/XMLCommonAttributes.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModuleManager.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/IDAccumulator.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Injector.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Injector/AutoParagraph.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Injector/DisplayLinkURI.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Injector/Linkify.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Injector/PurifierLinkify.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Injector/RemoveEmpty.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Injector/SafeObject.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Language.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Language/classes/en-x-test.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Language/messages/en-x-test.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Language/messages/en-x-testmini.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Language/messages/en.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/LanguageFactory.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Length.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Lexer.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Lexer/DOMLex.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Lexer/DirectLex.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Lexer/PEARSax3.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Lexer/PH5P.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/PercentEncoder.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Printer.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Printer/CSSDefinition.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Printer/ConfigForm.css (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Printer/ConfigForm.js (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Printer/ConfigForm.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Printer/HTMLDefinition.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/PropertyList.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/PropertyListIterator.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Strategy.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Strategy/Composite.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Strategy/Core.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Strategy/FixNesting.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Strategy/MakeWellFormed.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Strategy/RemoveForeignElements.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Strategy/ValidateAttributes.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/StringHash.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/StringHashParser.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/TagTransform.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/TagTransform/Font.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/TagTransform/Simple.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Token.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Token/Comment.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Token/Empty.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Token/End.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Token/Start.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Token/Tag.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Token/Text.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/TokenFactory.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/URI.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/URIDefinition.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/URIFilter.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/URIFilter/DisableExternal.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/URIFilter/DisableExternalResources.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/URIFilter/HostBlacklist.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/URIFilter/MakeAbsolute.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/URIFilter/Munge.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/URIParser.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/URIScheme.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/URIScheme/ftp.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/URIScheme/http.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/URIScheme/https.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/URIScheme/mailto.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/URIScheme/news.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/URIScheme/nntp.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/URISchemeRegistry.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/UnitConverter.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/VarParser.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/VarParser/Flexible.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/VarParser/Native.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/VarParserException.php (100%)
 rename 3.0/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifierLicense (100%)

diff --git a/3.0/modules/purifier/helpers/purifier.php b/3.0/modules/purifier/helpers/purifier.php
index 97742b50..2af53180 100644
--- a/3.0/modules/purifier/helpers/purifier.php
+++ b/3.0/modules/purifier/helpers/purifier.php
@@ -21,7 +21,7 @@ class purifier {
 
   static function purify($dirty_html) {
     if (!isset(self::$_purifier)) {
-      require_once(MODPATH . "purifier/lib/HTMLPurifier/HTMLPurifier.auto.php");
+      require_once(MODPATH . "purifier/vendor/HTMLPurifier/HTMLPurifier.auto.php");
       $config = HTMLPurifier_Config::createDefault();
       foreach (Kohana::config("purifier") as $category => $key_value) {
         foreach ($key_value as $key => $value) {
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier.auto.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier.auto.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier.auto.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier.auto.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier.autoload.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier.autoload.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier.autoload.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier.autoload.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier.func.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier.func.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier.func.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier.func.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier.includes.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier.includes.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier.includes.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier.includes.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier.kses.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier.kses.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier.kses.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier.kses.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier.path.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier.path.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier.path.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier.path.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier.safe-includes.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier.safe-includes.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier.safe-includes.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier.safe-includes.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrCollections.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrCollections.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrCollections.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrCollections.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/AlphaValue.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/AlphaValue.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/AlphaValue.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/AlphaValue.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Background.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Background.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Background.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Background.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Border.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Border.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Border.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Border.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Color.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Color.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Color.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Color.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Composite.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Composite.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Composite.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Composite.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Filter.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Filter.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Filter.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Filter.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Font.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Font.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Font.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Font.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/FontFamily.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/FontFamily.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/FontFamily.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/FontFamily.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Length.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Length.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Length.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Length.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/ListStyle.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/ListStyle.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/ListStyle.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/ListStyle.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Multiple.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Multiple.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Multiple.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Multiple.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Number.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Number.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Number.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Number.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Percentage.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Percentage.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Percentage.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Percentage.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/TextDecoration.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/TextDecoration.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/TextDecoration.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/TextDecoration.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/URI.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/URI.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/URI.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/URI.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/Enum.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/Enum.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/Enum.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/Enum.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Bool.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Bool.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Bool.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Bool.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Class.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Class.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Class.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Class.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Color.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Color.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Color.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Color.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/FrameTarget.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/HTML/FrameTarget.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/FrameTarget.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/HTML/FrameTarget.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/ID.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/HTML/ID.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/ID.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/HTML/ID.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Length.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Length.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Length.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Length.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/LinkTypes.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/HTML/LinkTypes.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/LinkTypes.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/HTML/LinkTypes.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/MultiLength.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/HTML/MultiLength.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/MultiLength.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/HTML/MultiLength.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Nmtokens.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Nmtokens.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Nmtokens.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Nmtokens.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Pixels.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Pixels.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Pixels.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Pixels.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/Integer.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/Integer.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/Integer.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/Integer.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/Lang.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/Lang.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/Lang.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/Lang.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/Switch.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/Switch.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/Switch.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/Switch.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/Text.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/Text.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/Text.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/Text.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/URI.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/URI.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/URI.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/URI.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/URI/Email.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/URI/Email.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/URI/Email.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/URI/Email.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/URI/Host.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/URI/Host.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/URI/Host.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/URI/Host.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/URI/IPv4.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/URI/IPv4.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/URI/IPv4.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/URI/IPv4.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/URI/IPv6.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/URI/IPv6.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/URI/IPv6.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/URI/IPv6.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/Background.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/Background.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/Background.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/Background.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/BdoDir.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/BdoDir.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/BdoDir.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/BdoDir.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/BgColor.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/BgColor.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/BgColor.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/BgColor.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/BoolToCSS.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/BoolToCSS.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/BoolToCSS.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/BoolToCSS.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/Border.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/Border.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/Border.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/Border.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/EnumToCSS.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/EnumToCSS.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/EnumToCSS.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/EnumToCSS.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/ImgRequired.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/ImgRequired.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/ImgRequired.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/ImgRequired.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/ImgSpace.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/ImgSpace.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/ImgSpace.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/ImgSpace.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/Input.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/Input.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/Input.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/Input.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/Lang.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/Lang.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/Lang.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/Lang.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/Length.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/Length.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/Length.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/Length.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/Name.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/Name.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/Name.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/Name.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/NameSync.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/NameSync.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/NameSync.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/NameSync.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/SafeEmbed.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/SafeEmbed.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/SafeEmbed.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/SafeEmbed.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/SafeObject.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/SafeObject.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/SafeObject.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/SafeObject.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/SafeParam.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/SafeParam.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/SafeParam.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/SafeParam.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/ScriptRequired.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/ScriptRequired.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/ScriptRequired.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/ScriptRequired.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/Textarea.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/Textarea.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/Textarea.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/Textarea.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTypes.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTypes.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTypes.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTypes.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrValidator.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrValidator.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrValidator.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrValidator.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Bootstrap.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Bootstrap.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Bootstrap.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Bootstrap.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/CSSDefinition.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/CSSDefinition.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/CSSDefinition.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/CSSDefinition.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ChildDef.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ChildDef.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ChildDef.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ChildDef.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ChildDef/Chameleon.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ChildDef/Chameleon.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ChildDef/Chameleon.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ChildDef/Chameleon.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ChildDef/Custom.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ChildDef/Custom.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ChildDef/Custom.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ChildDef/Custom.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ChildDef/Empty.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ChildDef/Empty.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ChildDef/Empty.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ChildDef/Empty.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ChildDef/Optional.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ChildDef/Optional.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ChildDef/Optional.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ChildDef/Optional.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ChildDef/Required.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ChildDef/Required.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ChildDef/Required.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ChildDef/Required.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ChildDef/StrictBlockquote.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ChildDef/StrictBlockquote.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ChildDef/StrictBlockquote.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ChildDef/StrictBlockquote.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ChildDef/Table.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ChildDef/Table.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ChildDef/Table.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ChildDef/Table.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Config.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Config.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Config.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Config.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/Builder/Xml.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/Builder/Xml.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/Builder/Xml.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/Builder/Xml.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/Exception.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/Exception.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/Exception.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/Exception.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/Interchange.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/Interchange.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/Interchange.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/Interchange.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/Interchange/Directive.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/Interchange/Directive.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/Interchange/Directive.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/Interchange/Directive.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/Interchange/Id.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/Interchange/Id.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/Interchange/Id.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/Interchange/Id.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/InterchangeBuilder.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/InterchangeBuilder.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/InterchangeBuilder.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/InterchangeBuilder.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/Validator.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/Validator.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/Validator.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/Validator.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/ValidatorAtom.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/ValidatorAtom.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/ValidatorAtom.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/ValidatorAtom.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema.ser b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema.ser
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema.ser
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema.ser
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.AllowedClasses.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.AllowedClasses.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.AllowedClasses.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.AllowedClasses.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.ClassUseCDATA.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.ClassUseCDATA.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.ClassUseCDATA.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.ClassUseCDATA.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.DefaultImageAlt.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.DefaultImageAlt.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.DefaultImageAlt.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.DefaultImageAlt.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.ForbiddenClasses.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.ForbiddenClasses.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.ForbiddenClasses.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.ForbiddenClasses.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.DisplayLinkURI.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.DisplayLinkURI.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.DisplayLinkURI.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.DisplayLinkURI.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.DocURL.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.DocURL.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.DocURL.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.DocURL.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.AllowImportant.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.AllowImportant.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.AllowImportant.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.AllowImportant.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.AllowTricky.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.AllowTricky.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.AllowTricky.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.AllowTricky.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.Language.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.Language.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.Language.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.Language.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.Custom.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.Custom.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.Custom.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.Custom.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Escaping.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Escaping.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Escaping.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Escaping.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Scope.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Scope.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Scope.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Scope.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.TidyImpl.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.TidyImpl.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.TidyImpl.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.TidyImpl.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Attr.Name.UseCDATA.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Attr.Name.UseCDATA.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Attr.Name.UseCDATA.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Attr.Name.UseCDATA.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenAttributes.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenAttributes.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenAttributes.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenAttributes.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenElements.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenElements.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenElements.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenElements.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.SortAttr.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.SortAttr.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.SortAttr.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.SortAttr.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.Base.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.Base.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.Base.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.Base.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.Host.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.Host.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.Host.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.Host.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.MungeResources.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.MungeResources.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.MungeResources.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.MungeResources.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/info.ini b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/info.ini
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/info.ini
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/info.ini
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ContentSets.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ContentSets.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ContentSets.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ContentSets.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Context.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Context.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Context.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Context.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Definition.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Definition.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Definition.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Definition.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/DefinitionCache.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/DefinitionCache.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/DefinitionCache.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/DefinitionCache.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/DefinitionCache/Decorator.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/DefinitionCache/Decorator.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/DefinitionCache/Decorator.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/DefinitionCache/Decorator.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/DefinitionCache/Decorator/Memory.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/DefinitionCache/Decorator/Memory.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/DefinitionCache/Decorator/Memory.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/DefinitionCache/Decorator/Memory.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/DefinitionCache/Decorator/Template.php.in b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/DefinitionCache/Decorator/Template.php.in
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/DefinitionCache/Decorator/Template.php.in
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/DefinitionCache/Decorator/Template.php.in
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/DefinitionCache/Null.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/DefinitionCache/Null.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/DefinitionCache/Null.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/DefinitionCache/Null.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/DefinitionCache/Serializer.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/DefinitionCache/Serializer.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/DefinitionCache/Serializer.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/DefinitionCache/Serializer.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/DefinitionCache/Serializer/README b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/DefinitionCache/Serializer/README
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/DefinitionCache/Serializer/README
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/DefinitionCache/Serializer/README
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/DefinitionCacheFactory.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/DefinitionCacheFactory.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/DefinitionCacheFactory.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/DefinitionCacheFactory.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Doctype.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Doctype.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Doctype.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Doctype.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/DoctypeRegistry.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/DoctypeRegistry.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/DoctypeRegistry.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/DoctypeRegistry.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ElementDef.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ElementDef.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ElementDef.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ElementDef.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Encoder.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Encoder.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Encoder.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Encoder.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/EntityLookup.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/EntityLookup.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/EntityLookup.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/EntityLookup.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/EntityLookup/entities.ser b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/EntityLookup/entities.ser
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/EntityLookup/entities.ser
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/EntityLookup/entities.ser
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/EntityParser.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/EntityParser.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/EntityParser.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/EntityParser.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ErrorCollector.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ErrorCollector.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ErrorCollector.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ErrorCollector.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ErrorStruct.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ErrorStruct.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ErrorStruct.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ErrorStruct.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Exception.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Exception.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Exception.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Exception.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Filter.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Filter.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Filter.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Filter.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Filter/ExtractStyleBlocks.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Filter/ExtractStyleBlocks.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Filter/ExtractStyleBlocks.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Filter/ExtractStyleBlocks.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Filter/YouTube.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Filter/YouTube.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Filter/YouTube.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Filter/YouTube.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Generator.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Generator.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Generator.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Generator.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLDefinition.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLDefinition.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLDefinition.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLDefinition.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Bdo.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Bdo.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Bdo.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Bdo.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/CommonAttributes.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/CommonAttributes.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/CommonAttributes.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/CommonAttributes.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Edit.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Edit.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Edit.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Edit.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Forms.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Forms.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Forms.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Forms.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Hypertext.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Hypertext.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Hypertext.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Hypertext.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Image.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Image.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Image.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Image.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Legacy.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Legacy.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Legacy.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Legacy.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/List.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/List.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/List.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/List.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Name.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Name.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Name.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Name.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Object.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Object.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Object.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Object.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Presentation.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Presentation.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Presentation.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Presentation.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Proprietary.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Proprietary.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Proprietary.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Proprietary.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Ruby.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Ruby.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Ruby.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Ruby.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/SafeEmbed.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/SafeEmbed.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/SafeEmbed.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/SafeEmbed.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/SafeObject.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/SafeObject.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/SafeObject.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/SafeObject.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Scripting.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Scripting.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Scripting.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Scripting.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/StyleAttribute.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/StyleAttribute.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/StyleAttribute.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/StyleAttribute.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Tables.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Tables.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Tables.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Tables.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Target.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Target.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Target.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Target.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Text.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Text.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Text.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Text.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Name.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Name.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Name.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Name.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Proprietary.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Proprietary.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Proprietary.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Proprietary.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Strict.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Strict.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Strict.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Strict.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Transitional.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Transitional.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Transitional.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Transitional.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/XHTML.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/XHTML.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/XHTML.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/XHTML.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/XMLCommonAttributes.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/XMLCommonAttributes.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/XMLCommonAttributes.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/XMLCommonAttributes.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModuleManager.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModuleManager.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModuleManager.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModuleManager.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/IDAccumulator.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/IDAccumulator.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/IDAccumulator.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/IDAccumulator.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Injector.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Injector.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Injector.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Injector.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Injector/AutoParagraph.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Injector/AutoParagraph.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Injector/AutoParagraph.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Injector/AutoParagraph.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Injector/DisplayLinkURI.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Injector/DisplayLinkURI.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Injector/DisplayLinkURI.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Injector/DisplayLinkURI.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Injector/Linkify.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Injector/Linkify.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Injector/Linkify.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Injector/Linkify.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Injector/PurifierLinkify.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Injector/PurifierLinkify.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Injector/PurifierLinkify.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Injector/PurifierLinkify.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Injector/RemoveEmpty.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Injector/RemoveEmpty.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Injector/RemoveEmpty.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Injector/RemoveEmpty.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Injector/SafeObject.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Injector/SafeObject.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Injector/SafeObject.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Injector/SafeObject.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Language.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Language.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Language.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Language.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Language/classes/en-x-test.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Language/classes/en-x-test.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Language/classes/en-x-test.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Language/classes/en-x-test.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Language/messages/en-x-test.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Language/messages/en-x-test.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Language/messages/en-x-test.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Language/messages/en-x-test.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Language/messages/en-x-testmini.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Language/messages/en-x-testmini.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Language/messages/en-x-testmini.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Language/messages/en-x-testmini.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Language/messages/en.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Language/messages/en.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Language/messages/en.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Language/messages/en.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/LanguageFactory.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/LanguageFactory.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/LanguageFactory.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/LanguageFactory.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Length.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Length.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Length.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Length.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Lexer.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Lexer.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Lexer.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Lexer.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Lexer/DOMLex.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Lexer/DOMLex.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Lexer/DOMLex.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Lexer/DOMLex.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Lexer/DirectLex.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Lexer/DirectLex.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Lexer/DirectLex.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Lexer/DirectLex.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Lexer/PEARSax3.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Lexer/PEARSax3.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Lexer/PEARSax3.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Lexer/PEARSax3.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Lexer/PH5P.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Lexer/PH5P.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Lexer/PH5P.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Lexer/PH5P.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/PercentEncoder.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/PercentEncoder.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/PercentEncoder.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/PercentEncoder.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Printer.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Printer.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Printer.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Printer.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Printer/CSSDefinition.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Printer/CSSDefinition.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Printer/CSSDefinition.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Printer/CSSDefinition.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Printer/ConfigForm.css b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Printer/ConfigForm.css
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Printer/ConfigForm.css
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Printer/ConfigForm.css
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Printer/ConfigForm.js b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Printer/ConfigForm.js
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Printer/ConfigForm.js
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Printer/ConfigForm.js
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Printer/ConfigForm.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Printer/ConfigForm.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Printer/ConfigForm.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Printer/ConfigForm.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Printer/HTMLDefinition.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Printer/HTMLDefinition.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Printer/HTMLDefinition.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Printer/HTMLDefinition.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/PropertyList.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/PropertyList.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/PropertyList.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/PropertyList.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/PropertyListIterator.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/PropertyListIterator.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/PropertyListIterator.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/PropertyListIterator.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Strategy.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Strategy.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Strategy.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Strategy.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Strategy/Composite.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Strategy/Composite.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Strategy/Composite.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Strategy/Composite.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Strategy/Core.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Strategy/Core.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Strategy/Core.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Strategy/Core.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Strategy/FixNesting.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Strategy/FixNesting.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Strategy/FixNesting.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Strategy/FixNesting.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Strategy/MakeWellFormed.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Strategy/MakeWellFormed.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Strategy/MakeWellFormed.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Strategy/MakeWellFormed.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Strategy/RemoveForeignElements.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Strategy/RemoveForeignElements.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Strategy/RemoveForeignElements.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Strategy/RemoveForeignElements.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Strategy/ValidateAttributes.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Strategy/ValidateAttributes.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Strategy/ValidateAttributes.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Strategy/ValidateAttributes.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/StringHash.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/StringHash.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/StringHash.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/StringHash.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/StringHashParser.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/StringHashParser.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/StringHashParser.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/StringHashParser.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/TagTransform.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/TagTransform.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/TagTransform.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/TagTransform.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/TagTransform/Font.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/TagTransform/Font.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/TagTransform/Font.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/TagTransform/Font.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/TagTransform/Simple.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/TagTransform/Simple.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/TagTransform/Simple.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/TagTransform/Simple.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Token.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Token.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Token.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Token.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Token/Comment.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Token/Comment.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Token/Comment.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Token/Comment.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Token/Empty.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Token/Empty.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Token/Empty.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Token/Empty.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Token/End.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Token/End.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Token/End.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Token/End.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Token/Start.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Token/Start.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Token/Start.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Token/Start.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Token/Tag.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Token/Tag.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Token/Tag.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Token/Tag.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Token/Text.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Token/Text.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Token/Text.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Token/Text.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/TokenFactory.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/TokenFactory.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/TokenFactory.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/TokenFactory.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URI.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URI.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URI.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URI.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URIDefinition.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIDefinition.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URIDefinition.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIDefinition.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URIFilter.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIFilter.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URIFilter.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIFilter.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URIFilter/DisableExternal.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIFilter/DisableExternal.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URIFilter/DisableExternal.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIFilter/DisableExternal.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URIFilter/DisableExternalResources.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIFilter/DisableExternalResources.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URIFilter/DisableExternalResources.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIFilter/DisableExternalResources.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URIFilter/HostBlacklist.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIFilter/HostBlacklist.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URIFilter/HostBlacklist.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIFilter/HostBlacklist.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URIFilter/MakeAbsolute.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIFilter/MakeAbsolute.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URIFilter/MakeAbsolute.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIFilter/MakeAbsolute.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URIFilter/Munge.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIFilter/Munge.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URIFilter/Munge.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIFilter/Munge.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URIParser.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIParser.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URIParser.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIParser.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URIScheme.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIScheme.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URIScheme.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIScheme.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URIScheme/ftp.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIScheme/ftp.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URIScheme/ftp.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIScheme/ftp.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URIScheme/http.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIScheme/http.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URIScheme/http.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIScheme/http.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URIScheme/https.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIScheme/https.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URIScheme/https.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIScheme/https.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URIScheme/mailto.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIScheme/mailto.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URIScheme/mailto.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIScheme/mailto.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URIScheme/news.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIScheme/news.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URIScheme/news.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIScheme/news.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URIScheme/nntp.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIScheme/nntp.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URIScheme/nntp.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIScheme/nntp.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URISchemeRegistry.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URISchemeRegistry.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URISchemeRegistry.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URISchemeRegistry.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/UnitConverter.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/UnitConverter.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/UnitConverter.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/UnitConverter.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/VarParser.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/VarParser.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/VarParser.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/VarParser.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/VarParser/Flexible.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/VarParser/Flexible.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/VarParser/Flexible.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/VarParser/Flexible.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/VarParser/Native.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/VarParser/Native.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/VarParser/Native.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/VarParser/Native.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/VarParserException.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/VarParserException.php
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifier/VarParserException.php
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/VarParserException.php
diff --git a/3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifierLicense b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifierLicense
similarity index 100%
rename from 3.0/modules/purifier/lib/HTMLPurifier/HTMLPurifierLicense
rename to 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifierLicense

From 0005833e8e6f09170b19a9a3cc33b56a6a271275 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 8 Jan 2011 18:39:08 -0800
Subject: [PATCH 07/10] Update HTMLPurifier to 4.2.0

---
 .../HTMLPurifier/HTMLPurifier.includes.php    |   6 +-
 .../vendor/HTMLPurifier/HTMLPurifier.php      |   6 +-
 .../HTMLPurifier.safe-includes.php            |   4 +
 .../HTMLPurifier/HTMLPurifier/AttrDef.php     |  36 +++++++
 .../AttrDef/CSS/BackgroundPosition.php        |  21 ++--
 .../HTMLPurifier/AttrDef/CSS/FontFamily.php   |  52 ++++------
 .../HTMLPurifier/AttrDef/CSS/URI.php          |  12 +--
 .../AttrTransform/ImgRequired.php             |   3 +-
 .../HTMLPurifier/AttrTransform/SafeParam.php  |  13 +++
 .../HTMLPurifier/CSSDefinition.php            |  19 +++-
 .../HTMLPurifier/HTMLPurifier/Config.php      |   2 +-
 .../HTMLPurifier/ConfigSchema/schema.ser      | Bin 12999 -> 13701 bytes
 ...utoFormat.RemoveSpansWithoutAttributes.txt |  11 +++
 .../schema/CSS.ForbiddenProperties.txt        |  13 +++
 .../schema/Core.NormalizeNewlines.txt         |  11 +++
 .../Core.RemoveProcessingInstructions.txt     |  11 +++
 .../ConfigSchema/schema/Filter.YouTube.txt    |   5 +
 .../ConfigSchema/schema/HTML.Allowed.txt      |  11 ++-
 .../schema/HTML.AllowedElements.txt           |  17 ++--
 .../schema/HTML.FlashAllowFullScreen.txt      |  11 +++
 .../ConfigSchema/schema/HTML.SafeEmbed.txt    |   7 +-
 .../ConfigSchema/schema/HTML.SafeObject.txt   |   7 +-
 .../schema/Output.FlashCompat.txt             |  11 +++
 .../schema/URI.AllowedSchemes.txt             |   2 +
 .../schema/URI.DisableResources.txt           |   7 +-
 .../HTMLPurifier/HTMLPurifier/ElementDef.php  |   7 ++
 .../HTMLPurifier/Filter/YouTube.php           |  10 +-
 .../HTMLPurifier/HTMLPurifier/Generator.php   |  56 ++++++++++-
 .../HTMLPurifier/HTMLDefinition.php           |   7 +-
 .../HTMLPurifier/HTMLModule/List.php          |   6 +-
 .../HTMLPurifier/HTMLModule/SafeEmbed.php     |   1 +
 .../HTMLPurifier/HTMLModule/SafeObject.php    |   5 +-
 .../HTMLModule/Tidy/Proprietary.php           |   1 +
 .../HTMLPurifier/Injector/AutoParagraph.php   |  21 ++--
 .../Injector/RemoveSpansWithoutAttributes.php |  60 +++++++++++
 .../HTMLPurifier/Injector/SafeObject.php      |   6 +-
 .../HTMLPurifier/Language/messages/en.php     |   1 +
 .../HTMLPurifier/HTMLPurifier/Lexer.php       |  34 ++++++-
 .../HTMLPurifier/Lexer/DirectLex.php          |   2 +-
 .../HTMLPurifier/Lexer/PEARSax3.php           |  37 ++++++-
 .../HTMLPurifier/HTMLPurifier/Lexer/PH5P.php  |   4 +-
 .../HTMLPurifier/Strategy/MakeWellFormed.php  |  18 ++++
 .../URIFilter/DisableResources.php            |  11 +++
 .../HTMLPurifier/URIScheme/data.php           |  93 ++++++++++++++++++
 .../HTMLPurifier/URIScheme/file.php           |  26 +++++
 .../HTMLPurifier/VarParser/Flexible.php       |   9 +-
 46 files changed, 599 insertions(+), 114 deletions(-)
 create mode 100644 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveSpansWithoutAttributes.txt
 create mode 100644 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.ForbiddenProperties.txt
 create mode 100644 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.NormalizeNewlines.txt
 create mode 100644 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.RemoveProcessingInstructions.txt
 create mode 100644 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.FlashAllowFullScreen.txt
 create mode 100644 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.FlashCompat.txt
 create mode 100644 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php
 create mode 100644 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIFilter/DisableResources.php
 create mode 100644 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIScheme/data.php
 create mode 100644 3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIScheme/file.php

diff --git a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier.includes.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier.includes.php
index e57f2ab3..08737c20 100644
--- a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier.includes.php
+++ b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier.includes.php
@@ -7,7 +7,7 @@
  * primary concern and you are using an opcode cache. PLEASE DO NOT EDIT THIS
  * FILE, changes will be overwritten the next time the script is run.
  *
- * @version 4.0.0
+ * @version 4.2.0
  *
  * @warning
  *      You must *not* include any other HTML Purifier files before this file,
@@ -176,6 +176,7 @@ require 'HTMLPurifier/Injector/DisplayLinkURI.php';
 require 'HTMLPurifier/Injector/Linkify.php';
 require 'HTMLPurifier/Injector/PurifierLinkify.php';
 require 'HTMLPurifier/Injector/RemoveEmpty.php';
+require 'HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php';
 require 'HTMLPurifier/Injector/SafeObject.php';
 require 'HTMLPurifier/Lexer/DOMLex.php';
 require 'HTMLPurifier/Lexer/DirectLex.php';
@@ -195,9 +196,12 @@ require 'HTMLPurifier/Token/Start.php';
 require 'HTMLPurifier/Token/Text.php';
 require 'HTMLPurifier/URIFilter/DisableExternal.php';
 require 'HTMLPurifier/URIFilter/DisableExternalResources.php';
+require 'HTMLPurifier/URIFilter/DisableResources.php';
 require 'HTMLPurifier/URIFilter/HostBlacklist.php';
 require 'HTMLPurifier/URIFilter/MakeAbsolute.php';
 require 'HTMLPurifier/URIFilter/Munge.php';
+require 'HTMLPurifier/URIScheme/data.php';
+require 'HTMLPurifier/URIScheme/file.php';
 require 'HTMLPurifier/URIScheme/ftp.php';
 require 'HTMLPurifier/URIScheme/http.php';
 require 'HTMLPurifier/URIScheme/https.php';
diff --git a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier.php
index 71e90632..0430ad39 100644
--- a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier.php
+++ b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier.php
@@ -19,7 +19,7 @@
  */
 
 /*
-    HTML Purifier 4.0.0 - Standards Compliant HTML Filtering
+    HTML Purifier 4.2.0 - Standards Compliant HTML Filtering
     Copyright (C) 2006-2008 Edward Z. Yang
 
     This library is free software; you can redistribute it and/or
@@ -55,10 +55,10 @@ class HTMLPurifier
 {
 
     /** Version of HTML Purifier */
-    public $version = '4.0.0';
+    public $version = '4.2.0';
 
     /** Constant with version of HTML Purifier */
-    const VERSION = '4.0.0';
+    const VERSION = '4.2.0';
 
     /** Global configuration object */
     public $config;
diff --git a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier.safe-includes.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier.safe-includes.php
index 5f0e1d8f..899a1f2e 100644
--- a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier.safe-includes.php
+++ b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier.safe-includes.php
@@ -170,6 +170,7 @@ require_once $__dir . '/HTMLPurifier/Injector/DisplayLinkURI.php';
 require_once $__dir . '/HTMLPurifier/Injector/Linkify.php';
 require_once $__dir . '/HTMLPurifier/Injector/PurifierLinkify.php';
 require_once $__dir . '/HTMLPurifier/Injector/RemoveEmpty.php';
+require_once $__dir . '/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php';
 require_once $__dir . '/HTMLPurifier/Injector/SafeObject.php';
 require_once $__dir . '/HTMLPurifier/Lexer/DOMLex.php';
 require_once $__dir . '/HTMLPurifier/Lexer/DirectLex.php';
@@ -189,9 +190,12 @@ require_once $__dir . '/HTMLPurifier/Token/Start.php';
 require_once $__dir . '/HTMLPurifier/Token/Text.php';
 require_once $__dir . '/HTMLPurifier/URIFilter/DisableExternal.php';
 require_once $__dir . '/HTMLPurifier/URIFilter/DisableExternalResources.php';
+require_once $__dir . '/HTMLPurifier/URIFilter/DisableResources.php';
 require_once $__dir . '/HTMLPurifier/URIFilter/HostBlacklist.php';
 require_once $__dir . '/HTMLPurifier/URIFilter/MakeAbsolute.php';
 require_once $__dir . '/HTMLPurifier/URIFilter/Munge.php';
+require_once $__dir . '/HTMLPurifier/URIScheme/data.php';
+require_once $__dir . '/HTMLPurifier/URIScheme/file.php';
 require_once $__dir . '/HTMLPurifier/URIScheme/ftp.php';
 require_once $__dir . '/HTMLPurifier/URIScheme/http.php';
 require_once $__dir . '/HTMLPurifier/URIScheme/https.php';
diff --git a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef.php
index 7fac54e8..6f82201e 100644
--- a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef.php
+++ b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef.php
@@ -82,6 +82,42 @@ abstract class HTMLPurifier_AttrDef
         return preg_replace('/rgb\((\d+)\s*,\s*(\d+)\s*,\s*(\d+)\)/', 'rgb(\1,\2,\3)', $string);
     }
 
+    /**
+     * Parses a possibly escaped CSS string and returns the "pure" 
+     * version of it.
+     */
+    protected function expandCSSEscape($string) {
+        // flexibly parse it
+        $ret = '';
+        for ($i = 0, $c = strlen($string); $i < $c; $i++) {
+            if ($string[$i] === '\\') {
+                $i++;
+                if ($i >= $c) {
+                    $ret .= '\\';
+                    break;
+                }
+                if (ctype_xdigit($string[$i])) {
+                    $code = $string[$i];
+                    for ($a = 1, $i++; $i < $c && $a < 6; $i++, $a++) {
+                        if (!ctype_xdigit($string[$i])) break;
+                        $code .= $string[$i];
+                    }
+                    // We have to be extremely careful when adding
+                    // new characters, to make sure we're not breaking
+                    // the encoding.
+                    $char = HTMLPurifier_Encoder::unichr(hexdec($code));
+                    if (HTMLPurifier_Encoder::cleanUTF8($char) === '') continue;
+                    $ret .= $char;
+                    if ($i < $c && trim($string[$i]) !== '') $i--;
+                    continue;
+                }
+                if ($string[$i] === "\n") continue;
+            }
+            $ret .= $string[$i];
+        }
+        return $ret;
+    }
+
 }
 
 // vim: et sw=4 sts=4
diff --git a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php
index e067a754..665321e3 100644
--- a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php
+++ b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php
@@ -59,7 +59,8 @@ class HTMLPurifier_AttrDef_CSS_BackgroundPosition extends HTMLPurifier_AttrDef
         $keywords = array();
         $keywords['h'] = false; // left, right
         $keywords['v'] = false; // top, bottom
-        $keywords['c'] = false; // center
+        $keywords['ch'] = false; // center (first word)
+        $keywords['cv'] = false; // center (second word)
         $measures = array();
 
         $i = 0;
@@ -79,6 +80,13 @@ class HTMLPurifier_AttrDef_CSS_BackgroundPosition extends HTMLPurifier_AttrDef
             $lbit = ctype_lower($bit) ? $bit : strtolower($bit);
             if (isset($lookup[$lbit])) {
                 $status = $lookup[$lbit];
+                if ($status == 'c') {
+                    if ($i == 0) {
+                        $status = 'ch';
+                    } else {
+                        $status = 'cv';
+                    }
+                }
                 $keywords[$status] = $lbit;
                 $i++;
             }
@@ -101,20 +109,19 @@ class HTMLPurifier_AttrDef_CSS_BackgroundPosition extends HTMLPurifier_AttrDef
 
         if (!$i) return false; // no valid values were caught
 
-
         $ret = array();
 
         // first keyword
         if     ($keywords['h'])     $ret[] = $keywords['h'];
-        elseif (count($measures))   $ret[] = array_shift($measures);
-        elseif ($keywords['c']) {
-            $ret[] = $keywords['c'];
-            $keywords['c'] = false; // prevent re-use: center = center center
+        elseif ($keywords['ch']) {
+            $ret[] = $keywords['ch'];
+            $keywords['cv'] = false; // prevent re-use: center = center center
         }
+        elseif (count($measures))   $ret[] = array_shift($measures);
 
         if     ($keywords['v'])     $ret[] = $keywords['v'];
+        elseif ($keywords['cv'])    $ret[] = $keywords['cv'];
         elseif (count($measures))   $ret[] = array_shift($measures);
-        elseif ($keywords['c'])     $ret[] = $keywords['c'];
 
         if (empty($ret)) return false;
         return implode(' ', $ret);
diff --git a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/FontFamily.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/FontFamily.php
index 33435c76..f1ceec4a 100644
--- a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/FontFamily.php
+++ b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/FontFamily.php
@@ -34,37 +34,10 @@ class HTMLPurifier_AttrDef_CSS_FontFamily extends HTMLPurifier_AttrDef
                 $quote = $font[0];
                 if ($font[$length - 1] !== $quote) continue;
                 $font = substr($font, 1, $length - 2);
-
-                $new_font = '';
-                for ($i = 0, $c = strlen($font); $i < $c; $i++) {
-                    if ($font[$i] === '\\') {
-                        $i++;
-                        if ($i >= $c) {
-                            $new_font .= '\\';
-                            break;
-                        }
-                        if (ctype_xdigit($font[$i])) {
-                            $code = $font[$i];
-                            for ($a = 1, $i++; $i < $c && $a < 6; $i++, $a++) {
-                                if (!ctype_xdigit($font[$i])) break;
-                                $code .= $font[$i];
-                            }
-                            // We have to be extremely careful when adding
-                            // new characters, to make sure we're not breaking
-                            // the encoding.
-                            $char = HTMLPurifier_Encoder::unichr(hexdec($code));
-                            if (HTMLPurifier_Encoder::cleanUTF8($char) === '') continue;
-                            $new_font .= $char;
-                            if ($i < $c && trim($font[$i]) !== '') $i--;
-                            continue;
-                        }
-                        if ($font[$i] === "\n") continue;
-                    }
-                    $new_font .= $font[$i];
-                }
-
-                $font = $new_font;
             }
+
+            $font = $this->expandCSSEscape($font);
+
             // $font is a pure representation of the font name
 
             if (ctype_alnum($font) && $font !== '') {
@@ -73,12 +46,21 @@ class HTMLPurifier_AttrDef_CSS_FontFamily extends HTMLPurifier_AttrDef
                 continue;
             }
 
-            // complicated font, requires quoting
+            // bugger out on whitespace.  form feed (0C) really
+            // shouldn't show up regardless
+            $font = str_replace(array("\n", "\t", "\r", "\x0C"), ' ', $font);
 
-            // armor single quotes and new lines
-            $font = str_replace("\\", "\\\\", $font);
-            $font = str_replace("'", "\\'", $font);
-            $final .= "'$font', ";
+            // These ugly transforms don't pose a security
+            // risk (as \\ and \" might).  We could try to be clever and
+            // use single-quote wrapping when there is a double quote
+            // present, but I have choosen not to implement that.
+            // (warning: this code relies on the selection of quotation
+            // mark below)
+            $font = str_replace('\\', '\\5C ', $font);
+            $font = str_replace('"',  '\\22 ', $font);
+
+            // complicated font, requires quoting
+            $final .= "\"$font\", "; // note that this will later get turned into &quot;
         }
         $final = rtrim($final, ', ');
         if ($final === '') return false;
diff --git a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/URI.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/URI.php
index d09c87bc..98df033d 100644
--- a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/URI.php
+++ b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/URI.php
@@ -34,20 +34,16 @@ class HTMLPurifier_AttrDef_CSS_URI extends HTMLPurifier_AttrDef_URI
             $uri = substr($uri, 1, $new_length - 1);
         }
 
-        $keys   = array(  '(',   ')',   ',',   ' ',   '"',   "'");
-        $values = array('\\(', '\\)', '\\,', '\\ ', '\\"', "\\'");
-        $uri = str_replace($values, $keys, $uri);
+        $uri = $this->expandCSSEscape($uri);
 
         $result = parent::validate($uri, $config, $context);
 
         if ($result === false) return false;
 
-        // escape necessary characters according to CSS spec
-        // except for the comma, none of these should appear in the
-        // URI at all
-        $result = str_replace($keys, $values, $result);
+        // extra sanity check; should have been done by URI
+        $result = str_replace(array('"', "\\", "\n", "\x0c", "\r"), "", $result);
 
-        return "url($result)";
+        return "url(\"$result\")";
 
     }
 
diff --git a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/ImgRequired.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/ImgRequired.php
index a1e5a83a..3d09eca3 100644
--- a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/ImgRequired.php
+++ b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/ImgRequired.php
@@ -24,7 +24,8 @@ class HTMLPurifier_AttrTransform_ImgRequired extends HTMLPurifier_AttrTransform
             if ($src) {
                 $alt = $config->get('Attr.DefaultImageAlt');
                 if ($alt === null) {
-                    $attr['alt'] = basename($attr['src']);
+                    // truncate if the alt is too long
+                    $attr['alt'] = substr(basename($attr['src']),0,40);
                 } else {
                     $attr['alt'] = $alt;
                 }
diff --git a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/SafeParam.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/SafeParam.php
index e677feae..d14390bc 100644
--- a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/SafeParam.php
+++ b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/SafeParam.php
@@ -33,12 +33,25 @@ class HTMLPurifier_AttrTransform_SafeParam extends HTMLPurifier_AttrTransform
             case 'allowNetworking':
                 $attr['value'] = 'internal';
                 break;
+            case 'allowFullScreen':
+                if ($config->get('HTML.FlashAllowFullScreen')) {
+                    $attr['value'] = ($attr['value'] == 'true') ? 'true' : 'false';
+                } else {
+                    $attr['value'] = 'false';
+                }
+                break;
             case 'wmode':
                 $attr['value'] = 'window';
                 break;
             case 'movie':
+            case 'src':
+                $attr['name'] = "movie";
                 $attr['value'] = $this->uri->validate($attr['value'], $config, $context);
                 break;
+            case 'flashvars':
+                // we're going to allow arbitrary inputs to the SWF, on
+                // the reasoning that it could only hack the SWF, not us.
+                break;
             // add other cases to support other param name/value pairs
             default:
                 $attr['name'] = $attr['value'] = null;
diff --git a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/CSSDefinition.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/CSSDefinition.php
index 17bf9931..09afc1f1 100644
--- a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/CSSDefinition.php
+++ b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/CSSDefinition.php
@@ -272,20 +272,29 @@ class HTMLPurifier_CSSDefinition extends HTMLPurifier_Definition
         // setup allowed elements
         $support = "(for information on implementing this, see the ".
                    "support forums) ";
-        $allowed_attributes = $config->get('CSS.AllowedProperties');
-        if ($allowed_attributes !== null) {
+        $allowed_properties = $config->get('CSS.AllowedProperties');
+        if ($allowed_properties !== null) {
             foreach ($this->info as $name => $d) {
-                if(!isset($allowed_attributes[$name])) unset($this->info[$name]);
-                unset($allowed_attributes[$name]);
+                if(!isset($allowed_properties[$name])) unset($this->info[$name]);
+                unset($allowed_properties[$name]);
             }
             // emit errors
-            foreach ($allowed_attributes as $name => $d) {
+            foreach ($allowed_properties as $name => $d) {
                 // :TODO: Is this htmlspecialchars() call really necessary?
                 $name = htmlspecialchars($name);
                 trigger_error("Style attribute '$name' is not supported $support", E_USER_WARNING);
             }
         }
 
+        $forbidden_properties = $config->get('CSS.ForbiddenProperties');
+        if ($forbidden_properties !== null) {
+            foreach ($this->info as $name => $d) {
+                if (isset($forbidden_properties[$name])) {
+                    unset($this->info[$name]);
+                }
+            }
+        }
+
     }
 }
 
diff --git a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Config.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Config.php
index 28529e7f..ada1b701 100644
--- a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Config.php
+++ b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Config.php
@@ -20,7 +20,7 @@ class HTMLPurifier_Config
     /**
      * HTML Purifier's version
      */
-    public $version = '4.0.0';
+    public $version = '4.2.0';
 
     /**
      * Bool indicator whether or not to automatically finalize
diff --git a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema.ser b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema.ser
index bbf12f9c3e7392aa8143727d2485f6f9ad1f97e1..978089c6291e7d828f6233ac632cedd8a98fdfd7 100644
GIT binary patch
delta 810
zcmX?}+L}GVl-bb0Wb<kM3TAC%ODiSE(vp0){G!~%61||*-2AfC;DW@w;_%FpjQr9P
z$C8qw%%swi)Z)q3!nMjq##Tzs!NGb!^+}m2DXDn@MfnA(MJ1W3#Y)zRRt8qpwVSsI
z>$Aui0oCOfrRw>C49>}{O7%-E&&kXKDNC|4ocvH+Mavju7Dx@mR-j4Asl~;adFh^c
z#U(|h$t9Wjd0^!RoAWrHGAWr_DS3qW`slgkBo=2l=H%p;yOrkT1Sc1zrsjc6HL#v6
zsH?EKfV+uN+QLf7zqF*Fv;?BsIX|}`u>`8<qQ2PXnKE@ulbiY7Mnhtz%z7q9^U0_A
zWjCkEd$JgikRp_<Gp)=gI|xfpKCYagfH!GmT3Jk1WRcu#tMZo#U)lf}_)uKV07zRG
mTM?N;K$`M6lr~qY&t@f%N<ijr7Suh=ge!%B6<pN+#smPO=oy&+

delta 147
zcmZq8KAt+kl*!U!vb>_~#?WZy$&Z;!CkLyEZJx{`&NBH7hr(t_&PPm>x9H1mw&iJJ
zoIJ@$c=HF|BTOV~sbiY_R>6?baI?H(8q4Gzsui1q)r6UWHb`wguX%uV^A`OBOq(Ye
HeP#jx*kClb

diff --git a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveSpansWithoutAttributes.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveSpansWithoutAttributes.txt
new file mode 100644
index 00000000..dde990ab
--- /dev/null
+++ b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveSpansWithoutAttributes.txt
@@ -0,0 +1,11 @@
+AutoFormat.RemoveSpansWithoutAttributes
+TYPE: bool
+VERSION: 4.0.1
+DEFAULT: false
+--DESCRIPTION--
+<p>
+  This directive causes <code>span</code> tags without any attributes
+  to be removed. It will also remove spans that had all attributes
+  removed during processing.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.ForbiddenProperties.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.ForbiddenProperties.txt
new file mode 100644
index 00000000..f1f5c5f1
--- /dev/null
+++ b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.ForbiddenProperties.txt
@@ -0,0 +1,13 @@
+CSS.ForbiddenProperties
+TYPE: lookup
+VERSION: 4.2.0
+DEFAULT: array()
+--DESCRIPTION--
+<p>
+    This is the logical inverse of %CSS.AllowedProperties, and it will
+    override that directive or any other directive.  If possible,
+    %CSS.AllowedProperties is recommended over this directive,
+    because it can sometimes be difficult to tell whether or not you've
+    forbidden all of the CSS properties you truly would like to disallow.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.NormalizeNewlines.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.NormalizeNewlines.txt
new file mode 100644
index 00000000..d77f5360
--- /dev/null
+++ b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.NormalizeNewlines.txt
@@ -0,0 +1,11 @@
+Core.NormalizeNewlines
+TYPE: bool
+VERSION: 4.2.0
+DEFAULT: true
+--DESCRIPTION--
+<p>
+    Whether or not to normalize newlines to the operating
+    system default.  When <code>false</code>, HTML Purifier
+    will attempt to preserve mixed newline files.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.RemoveProcessingInstructions.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.RemoveProcessingInstructions.txt
new file mode 100644
index 00000000..3397d9f7
--- /dev/null
+++ b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.RemoveProcessingInstructions.txt
@@ -0,0 +1,11 @@
+Core.RemoveProcessingInstructions
+TYPE: bool
+VERSION: 4.2.0
+DEFAULT: false
+--DESCRIPTION--
+Instead of escaping processing instructions in the form <code>&lt;? ...
+?&gt;</code>, remove it out-right.  This may be useful if the HTML
+you are validating contains XML processing instruction gunk, however,
+it can also be user-unfriendly for people attempting to post PHP
+snippets.
+--# vim: et sw=4 sts=4
diff --git a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt
index 7fa6536b..321eaa2d 100644
--- a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt
+++ b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt
@@ -3,6 +3,11 @@ TYPE: bool
 VERSION: 3.1.0
 DEFAULT: false
 --DESCRIPTION--
+<p>
+  <strong>Warning:</strong> Deprecated in favor of %HTML.SafeObject and
+  %Output.FlashCompat (turn both on to allow YouTube videos and other
+  Flash content).
+</p>
 <p>
   This directive enables YouTube video embedding in HTML Purifier. Check
   <a href="http://htmlpurifier.org/docs/enduser-youtube.html">this document
diff --git a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt
index 3e231d2d..0b2c106d 100644
--- a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt
+++ b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt
@@ -5,11 +5,14 @@ DEFAULT: NULL
 --DESCRIPTION--
 
 <p>
-    This is a convenience directive that rolls the functionality of
-    %HTML.AllowedElements and %HTML.AllowedAttributes into one directive.
+    This is a preferred convenience directive that combines
+    %HTML.AllowedElements and %HTML.AllowedAttributes.
     Specify elements and attributes that are allowed using:
-    <code>element1[attr1|attr2],element2...</code>. You can also use
-    newlines instead of commas to separate elements.
+    <code>element1[attr1|attr2],element2...</code>.  For example,
+    if you would like to only allow paragraphs and links, specify
+    <code>a[href],p</code>.  You can specify attributes that apply
+    to all elements using an asterisk, e.g. <code>*[lang]</code>.
+    You can also use newlines instead of commas to separate elements.
 </p>
 <p>
     <strong>Warning</strong>:
diff --git a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt
index 888d5581..1d3fa790 100644
--- a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt
+++ b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt
@@ -4,12 +4,17 @@ VERSION: 1.3.0
 DEFAULT: NULL
 --DESCRIPTION--
 <p>
-    If HTML Purifier's tag 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 a tag that HTML Purifier never
-    supported in the first place (like embed, form or head).  If you
-    change this, you probably also want to change %HTML.AllowedAttributes.
+    If HTML Purifier's tag set is unsatisfactory for your needs, you can
+    overload it with your own list of tags to allow.  If you change
+    this, you probably also want to change %HTML.AllowedAttributes; see
+    also %HTML.Allowed which lets you set allowed elements and
+    attributes at the same time.
+</p>
+<p>
+    If you attempt to allow an element that HTML Purifier does not know
+    about, HTML Purifier will raise an error.  You will need to manually
+    tell HTML Purifier about this element by using the
+    <a href="http://htmlpurifier.org/docs/enduser-customize.html">advanced customization features.</a>
 </p>
 <p>
     <strong>Warning:</strong> If another directive conflicts with the
diff --git a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.FlashAllowFullScreen.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.FlashAllowFullScreen.txt
new file mode 100644
index 00000000..7878dc0b
--- /dev/null
+++ b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.FlashAllowFullScreen.txt
@@ -0,0 +1,11 @@
+HTML.FlashAllowFullScreen
+TYPE: bool
+VERSION: 4.2.0
+DEFAULT: false
+--DESCRIPTION--
+<p>
+    Whether or not to permit embedded Flash content from
+    %HTML.SafeObject to expand to the full screen.  Corresponds to
+    the <code>allowFullScreen</code> parameter.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt
index f635a685..cdda09a4 100644
--- a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt
+++ b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt
@@ -7,8 +7,7 @@ DEFAULT: false
     Whether or not to permit embed tags in documents, with a number of extra
     security features added to prevent script execution. This is similar to
     what websites like MySpace do to embed tags. Embed is a proprietary
-    element and will cause your website to stop validating. You probably want
-    to enable this with %HTML.SafeObject.
-    <strong>Highly experimental.</strong>
-</p>
+    element and will cause your website to stop validating; you should
+    see if you can use %Output.FlashCompat with %HTML.SafeObject instead
+    first.</p>
 --# vim: et sw=4 sts=4
diff --git a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt
index 32967b88..ceb342e2 100644
--- a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt
+++ b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt
@@ -6,9 +6,8 @@ DEFAULT: false
 <p>
     Whether or not to permit object tags in documents, with a number of extra
     security features added to prevent script execution. This is similar to
-    what websites like MySpace do to object tags. You may also want to
-    enable %HTML.SafeEmbed for maximum interoperability with Internet Explorer,
-    although embed tags will cause your website to stop validating.
-    <strong>Highly experimental.</strong>
+    what websites like MySpace do to object tags.  You should also enable
+    %Output.FlashCompat in order to generate Internet Explorer
+    compatibility code for your object tags.
 </p>
 --# vim: et sw=4 sts=4
diff --git a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.FlashCompat.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.FlashCompat.txt
new file mode 100644
index 00000000..93398e85
--- /dev/null
+++ b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.FlashCompat.txt
@@ -0,0 +1,11 @@
+Output.FlashCompat
+TYPE: bool
+VERSION: 4.1.0
+DEFAULT: false
+--DESCRIPTION--
+<p>
+  If true, HTML Purifier will generate Internet Explorer compatibility
+  code for all object code.  This is highly recommended if you enable
+  %HTML.SafeObject.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt
index 98fdfe92..666635a5 100644
--- a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt
+++ b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt
@@ -12,4 +12,6 @@ array (
 --DESCRIPTION--
 Whitelist that defines the schemes that a URI is allowed to have.  This
 prevents XSS attacks from using pseudo-schemes like javascript or mocha.
+There is also support for the <code>data</code> and <code>file</code>
+URI schemes, but they are not enabled by default.
 --# vim: et sw=4 sts=4
diff --git a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt
index 51e6ea91..f891de49 100644
--- a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt
+++ b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt
@@ -1,12 +1,15 @@
 URI.DisableResources
 TYPE: bool
-VERSION: 1.3.0
+VERSION: 4.2.0
 DEFAULT: false
 --DESCRIPTION--
-
 <p>
     Disables embedding resources, essentially meaning no pictures. You can
     still link to them though. See %URI.DisableExternalResources for why
     this might be a good idea.
 </p>
+<p>
+    <em>Note:</em> While this directive has been available since 1.3.0,
+    it didn't actually start doing anything until 4.2.0.
+</p>
 --# vim: et sw=4 sts=4
diff --git a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ElementDef.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ElementDef.php
index c4f5df97..cbd4e345 100644
--- a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ElementDef.php
+++ b/3.0/modules/purifier/vendor/HTMLPurifier/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.
diff --git a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Filter/YouTube.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Filter/YouTube.php
index aa3c17a0..9a9d9f96 100644
--- a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Filter/YouTube.php
+++ b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Filter/YouTube.php
@@ -7,13 +7,13 @@ class HTMLPurifier_Filter_YouTube extends HTMLPurifier_Filter
 
     public function preFilter($html, $config, $context) {
         $pre_regex = '#<object[^>]+>.+?'.
-            'http://www.youtube.com/v/([A-Za-z0-9\-_]+).+?</object>#s';
+            'http://www.youtube.com/((?:v|cp)/[A-Za-z0-9\-_=]+).+?</object>#s';
         $pre_replace = '<span class="youtube-embed">\1</span>';
         return preg_replace($pre_regex, $pre_replace, $html);
     }
 
     public function postFilter($html, $config, $context) {
-        $post_regex = '#<span class="youtube-embed">([A-Za-z0-9\-_]+)</span>#';
+        $post_regex = '#<span class="youtube-embed">((?:v|cp)/[A-Za-z0-9\-_=]+)</span>#';
         return preg_replace_callback($post_regex, array($this, 'postFilterCallback'), $html);
     }
 
@@ -24,10 +24,10 @@ class HTMLPurifier_Filter_YouTube extends HTMLPurifier_Filter
     protected function postFilterCallback($matches) {
         $url = $this->armorUrl($matches[1]);
         return '<object width="425" height="350" type="application/x-shockwave-flash" '.
-            'data="http://www.youtube.com/v/'.$url.'">'.
-            '<param name="movie" value="http://www.youtube.com/v/'.$url.'"></param>'.
+            'data="http://www.youtube.com/'.$url.'">'.
+            '<param name="movie" value="http://www.youtube.com/'.$url.'"></param>'.
             '<!--[if IE]>'.
-            '<embed src="http://www.youtube.com/v/'.$url.'"'.
+            '<embed src="http://www.youtube.com/'.$url.'"'.
             'type="application/x-shockwave-flash"'.
             'wmode="transparent" width="425" height="350" />'.
             '<![endif]-->'.
diff --git a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Generator.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Generator.php
index 22e841c1..e5988b64 100644
--- a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Generator.php
+++ b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Generator.php
@@ -31,6 +31,17 @@ class HTMLPurifier_Generator
      */
     private $_sortAttr;
 
+    /**
+     * Cache of %Output.FlashCompat
+     */
+    private $_flashCompat;
+
+    /**
+     * Stack for keeping track of object information when outputting IE
+     * compatibility code.
+     */
+    private $_flashStack = array();
+
     /**
      * Configuration for the generator
      */
@@ -44,6 +55,7 @@ class HTMLPurifier_Generator
         $this->config = $config;
         $this->_scriptFix = $config->get('Output.CommentScriptContents');
         $this->_sortAttr = $config->get('Output.SortAttr');
+        $this->_flashCompat = $config->get('Output.FlashCompat');
         $this->_def = $config->getHTMLDefinition();
         $this->_xhtml = $this->_def->doctype->xml;
     }
@@ -86,9 +98,11 @@ class HTMLPurifier_Generator
         }
 
         // Normalize newlines to system defined value
-        $nl = $this->config->get('Output.Newline');
-        if ($nl === null) $nl = PHP_EOL;
-        if ($nl !== "\n") $html = str_replace("\n", $nl, $html);
+        if ($this->config->get('Core.NormalizeNewlines')) {
+            $nl = $this->config->get('Output.Newline');
+            if ($nl === null) $nl = PHP_EOL;
+            if ($nl !== "\n") $html = str_replace("\n", $nl, $html);
+        }
         return $html;
     }
 
@@ -104,12 +118,41 @@ class HTMLPurifier_Generator
 
         } elseif ($token instanceof HTMLPurifier_Token_Start) {
             $attr = $this->generateAttributes($token->attr, $token->name);
+            if ($this->_flashCompat) {
+                if ($token->name == "object") {
+                    $flash = new stdclass();
+                    $flash->attr = $token->attr;
+                    $flash->param = array();
+                    $this->_flashStack[] = $flash;
+                }
+            }
             return '<' . $token->name . ($attr ? ' ' : '') . $attr . '>';
 
         } elseif ($token instanceof HTMLPurifier_Token_End) {
-            return '</' . $token->name . '>';
+            $_extra = '';
+            if ($this->_flashCompat) {
+                if ($token->name == "object" && !empty($this->_flashStack)) {
+                    $flash = array_pop($this->_flashStack);
+                    $compat_token = new HTMLPurifier_Token_Empty("embed");
+                    foreach ($flash->attr as $name => $val) {
+                        if ($name == "classid") continue;
+                        if ($name == "type") continue;
+                        if ($name == "data") $name = "src";
+                        $compat_token->attr[$name] = $val;
+                    }
+                    foreach ($flash->param as $name => $val) {
+                        if ($name == "movie") $name = "src";
+                        $compat_token->attr[$name] = $val;
+                    }
+                    $_extra = "<!--[if IE]>".$this->generateFromToken($compat_token)."<![endif]-->";
+                }
+            }
+            return $_extra . '</' . $token->name . '>';
 
         } elseif ($token instanceof HTMLPurifier_Token_Empty) {
+            if ($this->_flashCompat && $token->name == "param" && !empty($this->_flashStack)) {
+                $this->_flashStack[count($this->_flashStack)-1]->param[$token->attr['name']] = $token->attr['value'];
+            }
             $attr = $this->generateAttributes($token->attr, $token->name);
              return '<' . $token->name . ($attr ? ' ' : '') . $attr .
                 ( $this->_xhtml ? ' /': '' ) // <br /> v. <br>
@@ -174,7 +217,10 @@ class HTMLPurifier_Generator
      *               permissible for non-attribute output.
      * @return String escaped data.
      */
-    public function escape($string, $quote = ENT_COMPAT) {
+    public function escape($string, $quote = null) {
+        // Workaround for APC bug on Mac Leopard reported by sidepodcast
+        // http://htmlpurifier.org/phorum/read.php?3,4823,4846
+        if ($quote === null) $quote = ENT_COMPAT;
         return htmlspecialchars($string, $quote, 'UTF-8');
     }
 
diff --git a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLDefinition.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLDefinition.php
index 0195ce4c..f775604a 100644
--- a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLDefinition.php
+++ b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLDefinition.php
@@ -300,7 +300,12 @@ class HTMLPurifier_HTMLDefinition extends HTMLPurifier_Definition
                             unset($allowed_attributes_mutable[$key]);
                         }
                     }
-                    if ($delete) unset($this->info[$tag]->attr[$attr]);
+                    if ($delete) {
+                        if ($this->info[$tag]->attr[$attr]->required) {
+                            trigger_error("Required attribute '$attr' in element '$tag' was not allowed, which means '$tag' will not be allowed either", E_USER_WARNING);
+                        }
+                        unset($this->info[$tag]->attr[$attr]);
+                    }
                 }
             }
             // emit errors
diff --git a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/List.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/List.php
index db2d5324..2911a69b 100644
--- a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/List.php
+++ b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/List.php
@@ -20,8 +20,10 @@ class HTMLPurifier_HTMLModule_List extends HTMLPurifier_HTMLModule
     public $content_sets = array('Flow' => 'List');
 
     public function setup($config) {
-        $this->addElement('ol', 'List', 'Required: li', 'Common');
-        $this->addElement('ul', 'List', 'Required: li', 'Common');
+        $ol = $this->addElement('ol', 'List', 'Required: li', 'Common');
+        $ol->wrap = "li";
+        $ul = $this->addElement('ul', 'List', 'Required: li', 'Common');
+        $ul->wrap = "li";
         $this->addElement('dl', 'List', 'Required: dt | dd', 'Common');
 
         $this->addElement('li', false, 'Flow', 'Common');
diff --git a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/SafeEmbed.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/SafeEmbed.php
index 1fd57145..7f602317 100644
--- a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/SafeEmbed.php
+++ b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/SafeEmbed.php
@@ -20,6 +20,7 @@ class HTMLPurifier_HTMLModule_SafeEmbed extends HTMLPurifier_HTMLModule
                 'height' => 'Pixels#' . $max,
                 'allowscriptaccess' => 'Enum#never',
                 'allownetworking' => 'Enum#internal',
+                'flashvars' => 'Text',
                 'wmode' => 'Enum#window',
                 'name' => 'ID',
             )
diff --git a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/SafeObject.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/SafeObject.php
index 4378d2c6..d3de4f47 100644
--- a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/SafeObject.php
+++ b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/SafeObject.php
@@ -28,7 +28,10 @@ class HTMLPurifier_HTMLModule_SafeObject extends HTMLPurifier_HTMLModule
                 'type'   => 'Enum#application/x-shockwave-flash',
                 'width'  => 'Pixels#' . $max,
                 'height' => 'Pixels#' . $max,
-                'data'   => 'URI#embedded'
+                'data'   => 'URI#embedded',
+                'classid' => 'Enum#clsid:d27cdb6e-ae6d-11cf-96b8-444553540000',
+                'codebase' => new HTMLPurifier_AttrDef_Enum(array(
+                    'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0')),
             )
         );
         $object->attr_transform_post[] = new HTMLPurifier_AttrTransform_SafeObject();
diff --git a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Proprietary.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Proprietary.php
index f6aa6b03..d043aa72 100644
--- a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Proprietary.php
+++ b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Proprietary.php
@@ -15,6 +15,7 @@ class HTMLPurifier_HTMLModule_Tidy_Proprietary extends HTMLPurifier_HTMLModule_T
         $r['thead@background'] = new HTMLPurifier_AttrTransform_Background();
         $r['tfoot@background'] = new HTMLPurifier_AttrTransform_Background();
         $r['tbody@background'] = new HTMLPurifier_AttrTransform_Background();
+        $r['table@height']     = new HTMLPurifier_AttrTransform_Length('height');
         return $r;
     }
 
diff --git a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Injector/AutoParagraph.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Injector/AutoParagraph.php
index c5444dbe..72152d81 100644
--- a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Injector/AutoParagraph.php
+++ b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Injector/AutoParagraph.php
@@ -34,16 +34,21 @@ class HTMLPurifier_Injector_AutoParagraph extends HTMLPurifier_Injector
                     //               ----
                     // This is a degenerate case
                 } else {
-                    // State 1.2: PAR1
-                    //            ----
+                    if (!$token->is_whitespace || $this->_isInline($current)) {
+                        // State 1.2: PAR1
+                        //            ----
 
-                    // State 1.3: PAR1\n\nPAR2
-                    //            ------------
+                        // State 1.3: PAR1\n\nPAR2
+                        //            ------------
 
-                    // State 1.4: <div>PAR1\n\nPAR2 (see State 2)
-                    //                 ------------
-                    $token = array($this->_pStart());
-                    $this->_splitText($text, $token);
+                        // State 1.4: <div>PAR1\n\nPAR2 (see State 2)
+                        //                 ------------
+                        $token = array($this->_pStart());
+                        $this->_splitText($text, $token);
+                    } else {
+                        // State 1.5: \n<hr />
+                        //            --
+                    }
                 }
             } else {
                 // State 2:   <div>PAR1... (similar to 1.4)
diff --git a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php
new file mode 100644
index 00000000..509d5dc7
--- /dev/null
+++ b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php
@@ -0,0 +1,60 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+
+/**
+ * Injector that removes spans with no attributes
+ */
+class HTMLPurifier_Injector_RemoveSpansWithoutAttributes extends HTMLPurifier_Injector
+{
+    public $name = 'RemoveSpansWithoutAttributes';
+    public $needed = array('span');
+
+    private $attrValidator;
+
+    /**
+     * Used by AttrValidator
+     */
+    private $config;
+    private $context;
+
+    public function prepare($config, $context) {
+        $this->attrValidator = new HTMLPurifier_AttrValidator();
+        $this->config = $config;
+        $this->context = $context;
+        return parent::prepare($config, $context);
+    }
+
+    public function handleElement(&$token) {
+        if ($token->name !== 'span' || !$token instanceof HTMLPurifier_Token_Start) {
+            return;
+        }
+
+        // We need to validate the attributes now since this doesn't normally
+        // happen until after MakeWellFormed. If all the attributes are removed
+        // the span needs to be removed too.
+        $this->attrValidator->validateToken($token, $this->config, $this->context);
+        $token->armor['ValidateAttributes'] = true;
+
+        if (!empty($token->attr)) {
+            return;
+        }
+
+        $nesting = 0;
+        $spanContentTokens = array();
+        while ($this->forwardUntilEndToken($i, $current, $nesting)) {}
+
+        if ($current instanceof HTMLPurifier_Token_End && $current->name === 'span') {
+            // Mark closing span tag for deletion
+            $current->markForDeletion = true;
+            // Delete open span tag
+            $token = false;
+        }
+    }
+
+    public function handleEnd(&$token) {
+        if ($token->markForDeletion) {
+            $token = false;
+        }
+    }
+}
+
+// vim: et sw=4 sts=4
diff --git a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Injector/SafeObject.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Injector/SafeObject.php
index 42d8fd40..fc01eebc 100644
--- a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Injector/SafeObject.php
+++ b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Injector/SafeObject.php
@@ -20,6 +20,9 @@ class HTMLPurifier_Injector_SafeObject extends HTMLPurifier_Injector
     protected $allowedParam = array(
         'wmode' => true,
         'movie' => true,
+        'flashvars' => true,
+        'src' => true,
+        'allowFullScreen' => true, // if omitted, assume to be 'false'
     );
 
     public function prepare($config, $context) {
@@ -47,7 +50,8 @@ class HTMLPurifier_Injector_SafeObject extends HTMLPurifier_Injector
                 // We need this fix because YouTube doesn't supply a data
                 // attribute, which we need if a type is specified. This is
                 // *very* Flash specific.
-                if (!isset($this->objectStack[$i]->attr['data']) && $token->attr['name'] == 'movie') {
+                if (!isset($this->objectStack[$i]->attr['data']) &&
+                    ($token->attr['name'] == 'movie' || $token->attr['name'] == 'src')) {
                     $this->objectStack[$i]->attr['data'] = $token->attr['value'];
                 }
                 // Check if the parameter is the correct value but has not
diff --git a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Language/messages/en.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Language/messages/en.php
index 5377e5a3..2c96e307 100644
--- a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Language/messages/en.php
+++ b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Language/messages/en.php
@@ -23,6 +23,7 @@ $messages = array(
 'Lexer: Missing gt'            => 'Missing greater-than sign (>), previous less-than sign (<) should be escaped',
 'Lexer: Missing attribute key' => 'Attribute declaration has no key',
 'Lexer: Missing end quote'     => 'Attribute declaration has no end quote',
+'Lexer: Extracted body'        => 'Removed document metadata tags',
 
 'Strategy_RemoveForeignElements: Tag transform'              => '<$1> element transformed into $CurrentToken.Serialized',
 'Strategy_RemoveForeignElements: Missing required attribute' => '$CurrentToken.Compact element missing required attribute $1',
diff --git a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Lexer.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Lexer.php
index 9f20a412..6d6f4864 100644
--- a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Lexer.php
+++ b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Lexer.php
@@ -230,6 +230,17 @@ class HTMLPurifier_Lexer
         );
     }
 
+    /**
+     * Special Internet Explorer conditional comments should be removed.
+     */
+    protected static function removeIEConditional($string) {
+        return preg_replace(
+            '#<!--\[if [^>]+\]>.*<!\[endif\]-->#si', // probably should generalize for all strings
+            '',
+            $string
+        );
+    }
+
     /**
      * Callback function for escapeCDATA() that does the work.
      *
@@ -252,20 +263,32 @@ class HTMLPurifier_Lexer
     public function normalize($html, $config, $context) {
 
         // normalize newlines to \n
-        $html = str_replace("\r\n", "\n", $html);
-        $html = str_replace("\r", "\n", $html);
+        if ($config->get('Core.NormalizeNewlines')) {
+            $html = str_replace("\r\n", "\n", $html);
+            $html = str_replace("\r", "\n", $html);
+        }
 
         if ($config->get('HTML.Trusted')) {
             // escape convoluted CDATA
             $html = $this->escapeCommentedCDATA($html);
         }
 
+        $html = $this->removeIEConditional($html);
+
         // escape CDATA
         $html = $this->escapeCDATA($html);
 
         // extract body from document if applicable
         if ($config->get('Core.ConvertDocumentToFragment')) {
-            $html = $this->extractBody($html);
+            $e = false;
+            if ($config->get('Core.CollectErrors')) {
+                $e =& $context->get('ErrorCollector');
+            }
+            $new_html = $this->extractBody($html);
+            if ($e && $new_html != $html) {
+                $e->send(E_WARNING, 'Lexer: Extracted body');
+            }
+            $html = $new_html;
         }
 
         // expand entities that aren't the big five
@@ -276,6 +299,11 @@ class HTMLPurifier_Lexer
         // represent non-SGML characters (horror, horror!)
         $html = HTMLPurifier_Encoder::cleanUTF8($html);
 
+        // if processing instructions are to removed, remove them now
+        if ($config->get('Core.RemoveProcessingInstructions')) {
+            $html = preg_replace('#<\?.+?\?>#s', '', $html);
+        }
+
         return $html;
     }
 
diff --git a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Lexer/DirectLex.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Lexer/DirectLex.php
index eb421b23..b7d9abfa 100644
--- a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Lexer/DirectLex.php
+++ b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Lexer/DirectLex.php
@@ -384,7 +384,7 @@ class HTMLPurifier_Lexer_DirectLex extends HTMLPurifier_Lexer
                 }
             }
             if ($value === false) $value = '';
-            return array($key => $value);
+            return array($key => $this->parseData($value));
         }
 
         // setup loop environment
diff --git a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Lexer/PEARSax3.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Lexer/PEARSax3.php
index 57173455..72c87635 100644
--- a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Lexer/PEARSax3.php
+++ b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Lexer/PEARSax3.php
@@ -26,13 +26,20 @@ class HTMLPurifier_Lexer_PEARSax3 extends HTMLPurifier_Lexer
      * Internal accumulator array for SAX parsers.
      */
     protected $tokens = array();
+    protected $last_token_was_empty;
+
+    private $parent_handler;
+    private $stack = array();
 
     public function tokenizeHTML($string, $config, $context) {
 
         $this->tokens = array();
+        $this->last_token_was_empty = false;
 
         $string = $this->normalize($string, $config, $context);
 
+        $this->parent_handler = set_error_handler(array($this, 'muteStrictErrorHandler'));
+
         $parser = new XML_HTMLSax3();
         $parser->set_object($this);
         $parser->set_element_handler('openHandler','closeHandler');
@@ -44,6 +51,8 @@ class HTMLPurifier_Lexer_PEARSax3 extends HTMLPurifier_Lexer
 
         $parser->parse($string);
 
+        restore_error_handler();
+
         return $this->tokens;
 
     }
@@ -58,9 +67,11 @@ class HTMLPurifier_Lexer_PEARSax3 extends HTMLPurifier_Lexer
         }
         if ($closed) {
             $this->tokens[] = new HTMLPurifier_Token_Empty($name, $attrs);
+            $this->last_token_was_empty = true;
         } else {
             $this->tokens[] = new HTMLPurifier_Token_Start($name, $attrs);
         }
+        $this->stack[] = $name;
         return true;
     }
 
@@ -71,10 +82,12 @@ class HTMLPurifier_Lexer_PEARSax3 extends HTMLPurifier_Lexer
         // HTMLSax3 seems to always send empty tags an extra close tag
         // check and ignore if you see it:
         // [TESTME] to make sure it doesn't overreach
-        if ($this->tokens[count($this->tokens)-1] instanceof HTMLPurifier_Token_Empty) {
+        if ($this->last_token_was_empty) {
+            $this->last_token_was_empty = false;
             return true;
         }
         $this->tokens[] = new HTMLPurifier_Token_End($name);
+        if (!empty($this->stack)) array_pop($this->stack);
         return true;
     }
 
@@ -82,6 +95,7 @@ class HTMLPurifier_Lexer_PEARSax3 extends HTMLPurifier_Lexer
      * Data event handler, interface is defined by PEAR package.
      */
     public function dataHandler(&$parser, $data) {
+        $this->last_token_was_empty = false;
         $this->tokens[] = new HTMLPurifier_Token_Text($data);
         return true;
     }
@@ -91,7 +105,18 @@ class HTMLPurifier_Lexer_PEARSax3 extends HTMLPurifier_Lexer
      */
     public function escapeHandler(&$parser, $data) {
         if (strpos($data, '--') === 0) {
-            $this->tokens[] = new HTMLPurifier_Token_Comment($data);
+            // remove trailing and leading double-dashes
+            $data = substr($data, 2);
+            if (strlen($data) >= 2 && substr($data, -2) == "--") {
+                $data = substr($data, 0, -2);
+            }
+            if (isset($this->stack[sizeof($this->stack) - 1]) &&
+                $this->stack[sizeof($this->stack) - 1] == "style") {
+                $this->tokens[] = new HTMLPurifier_Token_Text($data);
+            } else {
+                $this->tokens[] = new HTMLPurifier_Token_Comment($data);
+            }
+            $this->last_token_was_empty = false;
         }
         // CDATA is handled elsewhere, but if it was handled here:
         //if (strpos($data, '[CDATA[') === 0) {
@@ -101,6 +126,14 @@ class HTMLPurifier_Lexer_PEARSax3 extends HTMLPurifier_Lexer
         return true;
     }
 
+    /**
+     * An error handler that mutes strict errors
+     */
+    public function muteStrictErrorHandler($errno, $errstr, $errfile=null, $errline=null, $errcontext=null) {
+        if ($errno == E_STRICT) return;
+        return call_user_func($this->parent_handler, $errno, $errstr, $errfile, $errline, $errcontext);
+    }
+
 }
 
 // vim: et sw=4 sts=4
diff --git a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Lexer/PH5P.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Lexer/PH5P.php
index 0d20c0ce..b42965ef 100644
--- a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Lexer/PH5P.php
+++ b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Lexer/PH5P.php
@@ -125,8 +125,6 @@ class HTML5 {
     const EOF      = 5;
 
     public function __construct($data) {
-        $data = str_replace("\r\n", "\n", $data);
-        $data = str_replace("\r", null, $data);
 
         $this->data = $data;
         $this->char = -1;
@@ -3903,4 +3901,4 @@ class HTML5TreeConstructer {
         return $this->dom;
     }
 }
-
+?>
diff --git a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Strategy/MakeWellFormed.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Strategy/MakeWellFormed.php
index c81b6b7b..03c92bd4 100644
--- a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Strategy/MakeWellFormed.php
+++ b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Strategy/MakeWellFormed.php
@@ -83,6 +83,7 @@ class HTMLPurifier_Strategy_MakeWellFormed extends HTMLPurifier_Strategy
             $this->injectors[] = $injector;
         }
         foreach ($custom_injectors as $injector) {
+            if (!$injector) continue;
             if (is_string($injector)) {
                 $injector = "HTMLPurifier_Injector_$injector";
                 $injector = new $injector;
@@ -164,6 +165,7 @@ class HTMLPurifier_Strategy_MakeWellFormed extends HTMLPurifier_Strategy
             $token = $tokens[$t];
 
             //echo '<br>'; printTokens($tokens, $t); printTokens($this->stack);
+            //flush();
 
             // quick-check: if it's not a tag, no need to process
             if (empty($token->is_tag)) {
@@ -219,6 +221,22 @@ class HTMLPurifier_Strategy_MakeWellFormed extends HTMLPurifier_Strategy
                         $autoclose = false;
                     }
 
+                    if ($autoclose && $definition->info[$token->name]->wrap) {
+                        // Check if an element can be wrapped by another 
+                        // element to make it valid in a context (for 
+                        // example, <ul><ul> needs a <li> in between)
+                        $wrapname = $definition->info[$token->name]->wrap;
+                        $wrapdef = $definition->info[$wrapname];
+                        $elements = $wrapdef->child->getAllowedElements($config);
+                        $parent_elements = $definition->info[$parent->name]->child->getAllowedElements($config);
+                        if (isset($elements[$token->name]) && isset($parent_elements[$wrapname])) {
+                            $newtoken = new HTMLPurifier_Token_Start($wrapname);
+                            $this->insertBefore($newtoken);
+                            $reprocess = true;
+                            continue;
+                        }
+                    }
+
                     $carryover = false;
                     if ($autoclose && $definition->info[$parent->name]->formatting) {
                         $carryover = true;
diff --git a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIFilter/DisableResources.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIFilter/DisableResources.php
new file mode 100644
index 00000000..e69d970a
--- /dev/null
+++ b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIFilter/DisableResources.php
@@ -0,0 +1,11 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+
+class HTMLPurifier_URIFilter_DisableResources extends HTMLPurifier_URIFilter
+{
+    public $name = 'DisableResources';
+    public function filter(&$uri, $config, $context) {
+        return !$context->get('EmbeddedURI', true);
+    }
+}
+
+// vim: et sw=4 sts=4
diff --git a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIScheme/data.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIScheme/data.php
new file mode 100644
index 00000000..bc4fb8cd
--- /dev/null
+++ b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIScheme/data.php
@@ -0,0 +1,93 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+
+/**
+ * Implements data: URI for base64 encoded images supported by GD.
+ */
+class HTMLPurifier_URIScheme_data extends HTMLPurifier_URIScheme {
+
+    public $browsable = true;
+    public $allowed_types = array(
+        // you better write validation code for other types if you
+        // decide to allow them
+        'image/jpeg' => true,
+        'image/gif' => true,
+        'image/png' => true,
+        );
+
+    public function validate(&$uri, $config, $context) {
+        $result = explode(',', $uri->path, 2);
+        $is_base64 = false;
+        $charset = null;
+        $content_type = null;
+        if (count($result) == 2) {
+            list($metadata, $data) = $result;
+            // do some legwork on the metadata
+            $metas = explode(';', $metadata);
+            while(!empty($metas)) {
+                $cur = array_shift($metas);
+                if ($cur == 'base64') {
+                    $is_base64 = true;
+                    break;
+                }
+                if (substr($cur, 0, 8) == 'charset=') {
+                    // doesn't match if there are arbitrary spaces, but
+                    // whatever dude
+                    if ($charset !== null) continue; // garbage
+                    $charset = substr($cur, 8); // not used
+                } else {
+                    if ($content_type !== null) continue; // garbage
+                    $content_type = $cur;
+                }
+            }
+        } else {
+            $data = $result[0];
+        }
+        if ($content_type !== null && empty($this->allowed_types[$content_type])) {
+            return false;
+        }
+        if ($charset !== null) {
+            // error; we don't allow plaintext stuff
+            $charset = null;
+        }
+        $data = rawurldecode($data);
+        if ($is_base64) {
+            $raw_data = base64_decode($data);
+        } else {
+            $raw_data = $data;
+        }
+        // XXX probably want to refactor this into a general mechanism
+        // for filtering arbitrary content types
+        $file = tempnam("/tmp", "");
+        file_put_contents($file, $raw_data);
+        if (function_exists('exif_imagetype')) {
+            $image_code = exif_imagetype($file);
+        } elseif (function_exists('getimagesize')) {
+            set_error_handler(array($this, 'muteErrorHandler'));
+            $info = getimagesize($file);
+            restore_error_handler();
+            if ($info == false) return false;
+            $image_code = $info[2];
+        } else {
+            trigger_error("could not find exif_imagetype or getimagesize functions", E_USER_ERROR);
+        }
+        $real_content_type = image_type_to_mime_type($image_code);
+        if ($real_content_type != $content_type) {
+            // we're nice guys; if the content type is something else we
+            // support, change it over
+            if (empty($this->allowed_types[$real_content_type])) return false;
+            $content_type = $real_content_type;
+        }
+        // ok, it's kosher, rewrite what we need
+        $uri->userinfo = null;
+        $uri->host = null;
+        $uri->port = null;
+        $uri->fragment = null;
+        $uri->query = null;
+        $uri->path = "$content_type;base64," . base64_encode($raw_data);
+        return true;
+    }
+
+    public function muteErrorHandler($errno, $errstr) {}
+
+}
+
diff --git a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIScheme/file.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIScheme/file.php
new file mode 100644
index 00000000..66c30232
--- /dev/null
+++ b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIScheme/file.php
@@ -0,0 +1,26 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+
+/**
+ * Validates file as defined by RFC 1630 and RFC 1738.
+ */
+class HTMLPurifier_URIScheme_file extends HTMLPurifier_URIScheme {
+
+    // Generally file:// URLs are not accessible from most
+    // machines, so placing them as an img src is incorrect.
+    public $browsable = false;
+
+    public function validate(&$uri, $config, $context) {
+        parent::validate($uri, $config, $context);
+        // Authentication method is not supported
+        $uri->userinfo = null;
+        // file:// makes no provisions for accessing the resource
+        $uri->port     = null;
+        // While it seems to work on Firefox, the querystring has
+        // no possible effect and is thus stripped.
+        $uri->query    = null;
+        return true;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/VarParser/Flexible.php b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/VarParser/Flexible.php
index e5998e5e..dea9f169 100644
--- a/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/VarParser/Flexible.php
+++ b/3.0/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/VarParser/Flexible.php
@@ -62,7 +62,7 @@ class HTMLPurifier_VarParser_Flexible extends HTMLPurifier_VarParser
                         foreach ($var as $keypair) {
                             $c = explode(':', $keypair, 2);
                             if (!isset($c[1])) continue;
-                            $nvar[$c[0]] = $c[1];
+                            $nvar[trim($c[0])] = trim($c[1]);
                         }
                         $var = $nvar;
                     }
@@ -79,8 +79,15 @@ class HTMLPurifier_VarParser_Flexible extends HTMLPurifier_VarParser
                         return $new;
                     } else break;
                 }
+                if ($type === self::ALIST) {
+                    trigger_error("Array list did not have consecutive integer indexes", E_USER_WARNING);
+                    return array_values($var);
+                }
                 if ($type === self::LOOKUP) {
                     foreach ($var as $key => $value) {
+                        if ($value !== true) {
+                            trigger_error("Lookup array has non-true value at key '$key'; maybe your input array was not indexed numerically", E_USER_WARNING);
+                        }
                         $var[$key] = true;
                     }
                 }

From 426cd2a9082d78da4981f15a4d4052be806a1432 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 8 Jan 2011 18:40:34 -0800
Subject: [PATCH 08/10] Update HTMLPurifier to 4.2.0 and move the code from lib
 to vendor

---
 3.1/modules/purifier/helpers/purifier.php     |   2 +-
 .../HTMLPurifier/ConfigSchema/schema.ser      | Bin 12999 -> 0 bytes
 .../schema/HTML.AllowedElements.txt           |  18 ----
 .../ConfigSchema/schema/HTML.SafeObject.txt   |  14 ---
 .../HTMLPurifier/HTMLPurifier.auto.php        |   0
 .../HTMLPurifier/HTMLPurifier.autoload.php    |   0
 .../HTMLPurifier/HTMLPurifier.func.php        |   0
 .../HTMLPurifier/HTMLPurifier.includes.php    |   6 +-
 .../HTMLPurifier/HTMLPurifier.kses.php        |   0
 .../HTMLPurifier/HTMLPurifier.path.php        |   0
 .../HTMLPurifier/HTMLPurifier.php             |   6 +-
 .../HTMLPurifier.safe-includes.php            |   4 +
 .../HTMLPurifier/AttrCollections.php          |   0
 .../HTMLPurifier/HTMLPurifier/AttrDef.php     |  36 +++++++
 .../HTMLPurifier/HTMLPurifier/AttrDef/CSS.php |   0
 .../HTMLPurifier/AttrDef/CSS/AlphaValue.php   |   0
 .../HTMLPurifier/AttrDef/CSS/Background.php   |   0
 .../AttrDef/CSS/BackgroundPosition.php        |  21 ++--
 .../HTMLPurifier/AttrDef/CSS/Border.php       |   0
 .../HTMLPurifier/AttrDef/CSS/Color.php        |   0
 .../HTMLPurifier/AttrDef/CSS/Composite.php    |   0
 .../AttrDef/CSS/DenyElementDecorator.php      |   0
 .../HTMLPurifier/AttrDef/CSS/Filter.php       |   0
 .../HTMLPurifier/AttrDef/CSS/Font.php         |   0
 .../HTMLPurifier/AttrDef/CSS/FontFamily.php   |  52 ++++------
 .../AttrDef/CSS/ImportantDecorator.php        |   0
 .../HTMLPurifier/AttrDef/CSS/Length.php       |   0
 .../HTMLPurifier/AttrDef/CSS/ListStyle.php    |   0
 .../HTMLPurifier/AttrDef/CSS/Multiple.php     |   0
 .../HTMLPurifier/AttrDef/CSS/Number.php       |   0
 .../HTMLPurifier/AttrDef/CSS/Percentage.php   |   0
 .../AttrDef/CSS/TextDecoration.php            |   0
 .../HTMLPurifier/AttrDef/CSS/URI.php          |  12 +--
 .../HTMLPurifier/AttrDef/Enum.php             |   0
 .../HTMLPurifier/AttrDef/HTML/Bool.php        |   0
 .../HTMLPurifier/AttrDef/HTML/Class.php       |   0
 .../HTMLPurifier/AttrDef/HTML/Color.php       |   0
 .../HTMLPurifier/AttrDef/HTML/FrameTarget.php |   0
 .../HTMLPurifier/AttrDef/HTML/ID.php          |   0
 .../HTMLPurifier/AttrDef/HTML/Length.php      |   0
 .../HTMLPurifier/AttrDef/HTML/LinkTypes.php   |   0
 .../HTMLPurifier/AttrDef/HTML/MultiLength.php |   0
 .../HTMLPurifier/AttrDef/HTML/Nmtokens.php    |   0
 .../HTMLPurifier/AttrDef/HTML/Pixels.php      |   0
 .../HTMLPurifier/AttrDef/Integer.php          |   0
 .../HTMLPurifier/AttrDef/Lang.php             |   0
 .../HTMLPurifier/AttrDef/Switch.php           |   0
 .../HTMLPurifier/AttrDef/Text.php             |   0
 .../HTMLPurifier/HTMLPurifier/AttrDef/URI.php |   0
 .../HTMLPurifier/AttrDef/URI/Email.php        |   0
 .../AttrDef/URI/Email/SimpleCheck.php         |   0
 .../HTMLPurifier/AttrDef/URI/Host.php         |   0
 .../HTMLPurifier/AttrDef/URI/IPv4.php         |   0
 .../HTMLPurifier/AttrDef/URI/IPv6.php         |   0
 .../HTMLPurifier/AttrTransform.php            |   0
 .../HTMLPurifier/AttrTransform/Background.php |   0
 .../HTMLPurifier/AttrTransform/BdoDir.php     |   0
 .../HTMLPurifier/AttrTransform/BgColor.php    |   0
 .../HTMLPurifier/AttrTransform/BoolToCSS.php  |   0
 .../HTMLPurifier/AttrTransform/Border.php     |   0
 .../HTMLPurifier/AttrTransform/EnumToCSS.php  |   0
 .../AttrTransform/ImgRequired.php             |   3 +-
 .../HTMLPurifier/AttrTransform/ImgSpace.php   |   0
 .../HTMLPurifier/AttrTransform/Input.php      |   0
 .../HTMLPurifier/AttrTransform/Lang.php       |   0
 .../HTMLPurifier/AttrTransform/Length.php     |   0
 .../HTMLPurifier/AttrTransform/Name.php       |   0
 .../HTMLPurifier/AttrTransform/NameSync.php   |   0
 .../HTMLPurifier/AttrTransform/SafeEmbed.php  |   0
 .../HTMLPurifier/AttrTransform/SafeObject.php |   0
 .../HTMLPurifier/AttrTransform/SafeParam.php  |  13 +++
 .../AttrTransform/ScriptRequired.php          |   0
 .../HTMLPurifier/AttrTransform/Textarea.php   |   0
 .../HTMLPurifier/HTMLPurifier/AttrTypes.php   |   0
 .../HTMLPurifier/AttrValidator.php            |   0
 .../HTMLPurifier/HTMLPurifier/Bootstrap.php   |   0
 .../HTMLPurifier/CSSDefinition.php            |  19 +++-
 .../HTMLPurifier/HTMLPurifier/ChildDef.php    |   0
 .../HTMLPurifier/ChildDef/Chameleon.php       |   0
 .../HTMLPurifier/ChildDef/Custom.php          |   0
 .../HTMLPurifier/ChildDef/Empty.php           |   0
 .../HTMLPurifier/ChildDef/Optional.php        |   0
 .../HTMLPurifier/ChildDef/Required.php        |   0
 .../ChildDef/StrictBlockquote.php             |   0
 .../HTMLPurifier/ChildDef/Table.php           |   0
 .../HTMLPurifier/HTMLPurifier/Config.php      |   2 +-
 .../HTMLPurifier/ConfigSchema.php             |   0
 .../ConfigSchema/Builder/ConfigSchema.php     |   0
 .../HTMLPurifier/ConfigSchema/Builder/Xml.php |   0
 .../HTMLPurifier/ConfigSchema/Exception.php   |   0
 .../HTMLPurifier/ConfigSchema/Interchange.php |   0
 .../ConfigSchema/Interchange/Directive.php    |   0
 .../ConfigSchema/Interchange/Id.php           |   0
 .../ConfigSchema/InterchangeBuilder.php       |   0
 .../HTMLPurifier/ConfigSchema/Validator.php   |   0
 .../ConfigSchema/ValidatorAtom.php            |   0
 .../HTMLPurifier/ConfigSchema/schema.ser      | Bin 0 -> 13701 bytes
 .../schema/Attr.AllowedClasses.txt            |   0
 .../schema/Attr.AllowedFrameTargets.txt       |   0
 .../ConfigSchema/schema/Attr.AllowedRel.txt   |   0
 .../ConfigSchema/schema/Attr.AllowedRev.txt   |   0
 .../schema/Attr.ClassUseCDATA.txt             |   0
 .../schema/Attr.DefaultImageAlt.txt           |   0
 .../schema/Attr.DefaultInvalidImage.txt       |   0
 .../schema/Attr.DefaultInvalidImageAlt.txt    |   0
 .../schema/Attr.DefaultTextDir.txt            |   0
 .../ConfigSchema/schema/Attr.EnableID.txt     |   0
 .../schema/Attr.ForbiddenClasses.txt          |   0
 .../ConfigSchema/schema/Attr.IDBlacklist.txt  |   0
 .../schema/Attr.IDBlacklistRegexp.txt         |   0
 .../ConfigSchema/schema/Attr.IDPrefix.txt     |   0
 .../schema/Attr.IDPrefixLocal.txt             |   0
 .../schema/AutoFormat.AutoParagraph.txt       |   0
 .../ConfigSchema/schema/AutoFormat.Custom.txt |   0
 .../schema/AutoFormat.DisplayLinkURI.txt      |   0
 .../schema/AutoFormat.Linkify.txt             |   0
 .../AutoFormat.PurifierLinkify.DocURL.txt     |   0
 .../schema/AutoFormat.PurifierLinkify.txt     |   0
 ...rmat.RemoveEmpty.RemoveNbsp.Exceptions.txt |   0
 .../AutoFormat.RemoveEmpty.RemoveNbsp.txt     |   0
 .../schema/AutoFormat.RemoveEmpty.txt         |   0
 ...utoFormat.RemoveSpansWithoutAttributes.txt |  11 +++
 .../schema/CSS.AllowImportant.txt             |   0
 .../ConfigSchema/schema/CSS.AllowTricky.txt   |   0
 .../schema/CSS.AllowedProperties.txt          |   0
 .../ConfigSchema/schema/CSS.DefinitionRev.txt |   0
 .../schema/CSS.ForbiddenProperties.txt        |  13 +++
 .../ConfigSchema/schema/CSS.MaxImgLength.txt  |   0
 .../ConfigSchema/schema/CSS.Proprietary.txt   |   0
 .../schema/Cache.DefinitionImpl.txt           |   0
 .../schema/Cache.SerializerPath.txt           |   0
 .../schema/Core.AggressivelyFixLt.txt         |   0
 .../schema/Core.CollectErrors.txt             |   0
 .../schema/Core.ColorKeywords.txt             |   0
 .../schema/Core.ConvertDocumentToFragment.txt |   0
 .../Core.DirectLexLineNumberSyncInterval.txt  |   0
 .../ConfigSchema/schema/Core.Encoding.txt     |   0
 .../schema/Core.EscapeInvalidChildren.txt     |   0
 .../schema/Core.EscapeInvalidTags.txt         |   0
 .../schema/Core.EscapeNonASCIICharacters.txt  |   0
 .../schema/Core.HiddenElements.txt            |   0
 .../ConfigSchema/schema/Core.Language.txt     |   0
 .../ConfigSchema/schema/Core.LexerImpl.txt    |   0
 .../schema/Core.MaintainLineNumbers.txt       |   0
 .../schema/Core.NormalizeNewlines.txt         |  11 +++
 .../schema/Core.RemoveInvalidImg.txt          |   0
 .../Core.RemoveProcessingInstructions.txt     |  11 +++
 .../schema/Core.RemoveScriptContents.txt      |   0
 .../ConfigSchema/schema/Filter.Custom.txt     |   0
 .../Filter.ExtractStyleBlocks.Escaping.txt    |   0
 .../Filter.ExtractStyleBlocks.Scope.txt       |   0
 .../Filter.ExtractStyleBlocks.TidyImpl.txt    |   0
 .../schema/Filter.ExtractStyleBlocks.txt      |   0
 .../ConfigSchema/schema/Filter.YouTube.txt    |   5 +
 .../ConfigSchema/schema/HTML.Allowed.txt      |  11 ++-
 .../schema/HTML.AllowedAttributes.txt         |   0
 .../schema/HTML.AllowedElements.txt           |  23 +++++
 .../schema/HTML.AllowedModules.txt            |   0
 .../schema/HTML.Attr.Name.UseCDATA.txt        |   0
 .../ConfigSchema/schema/HTML.BlockWrapper.txt |   0
 .../ConfigSchema/schema/HTML.CoreModules.txt  |   0
 .../schema/HTML.CustomDoctype.txt             |   0
 .../ConfigSchema/schema/HTML.DefinitionID.txt |   0
 .../schema/HTML.DefinitionRev.txt             |   0
 .../ConfigSchema/schema/HTML.Doctype.txt      |   0
 .../schema/HTML.FlashAllowFullScreen.txt      |  11 +++
 .../schema/HTML.ForbiddenAttributes.txt       |   0
 .../schema/HTML.ForbiddenElements.txt         |   0
 .../ConfigSchema/schema/HTML.MaxImgLength.txt |   0
 .../ConfigSchema/schema/HTML.Parent.txt       |   0
 .../ConfigSchema/schema/HTML.Proprietary.txt  |   0
 .../ConfigSchema/schema/HTML.SafeEmbed.txt    |   7 +-
 .../ConfigSchema/schema/HTML.SafeObject.txt   |  13 +++
 .../ConfigSchema/schema/HTML.Strict.txt       |   0
 .../ConfigSchema/schema/HTML.TidyAdd.txt      |   0
 .../ConfigSchema/schema/HTML.TidyLevel.txt    |   0
 .../ConfigSchema/schema/HTML.TidyRemove.txt   |   0
 .../ConfigSchema/schema/HTML.Trusted.txt      |   0
 .../ConfigSchema/schema/HTML.XHTML.txt        |   0
 .../schema/Output.CommentScriptContents.txt   |   0
 .../schema/Output.FlashCompat.txt             |  11 +++
 .../ConfigSchema/schema/Output.Newline.txt    |   0
 .../ConfigSchema/schema/Output.SortAttr.txt   |   0
 .../ConfigSchema/schema/Output.TidyFormat.txt |   0
 .../ConfigSchema/schema/Test.ForceNoIconv.txt |   0
 .../schema/URI.AllowedSchemes.txt             |   2 +
 .../ConfigSchema/schema/URI.Base.txt          |   0
 .../ConfigSchema/schema/URI.DefaultScheme.txt |   0
 .../ConfigSchema/schema/URI.DefinitionID.txt  |   0
 .../ConfigSchema/schema/URI.DefinitionRev.txt |   0
 .../ConfigSchema/schema/URI.Disable.txt       |   0
 .../schema/URI.DisableExternal.txt            |   0
 .../schema/URI.DisableExternalResources.txt   |   0
 .../schema/URI.DisableResources.txt           |   7 +-
 .../ConfigSchema/schema/URI.Host.txt          |   0
 .../ConfigSchema/schema/URI.HostBlacklist.txt |   0
 .../ConfigSchema/schema/URI.MakeAbsolute.txt  |   0
 .../ConfigSchema/schema/URI.Munge.txt         |   0
 .../schema/URI.MungeResources.txt             |   0
 .../schema/URI.MungeSecretKey.txt             |   0
 .../schema/URI.OverrideAllowedSchemes.txt     |   0
 .../HTMLPurifier/ConfigSchema/schema/info.ini |   0
 .../HTMLPurifier/HTMLPurifier/ContentSets.php |   0
 .../HTMLPurifier/HTMLPurifier/Context.php     |   0
 .../HTMLPurifier/HTMLPurifier/Definition.php  |   0
 .../HTMLPurifier/DefinitionCache.php          |   0
 .../DefinitionCache/Decorator.php             |   0
 .../DefinitionCache/Decorator/Cleanup.php     |   0
 .../DefinitionCache/Decorator/Memory.php      |   0
 .../DefinitionCache/Decorator/Template.php.in |   0
 .../HTMLPurifier/DefinitionCache/Null.php     |   0
 .../DefinitionCache/Serializer.php            |   0
 .../DefinitionCache/Serializer/README         |   0
 .../HTMLPurifier/DefinitionCacheFactory.php   |   0
 .../HTMLPurifier/HTMLPurifier/Doctype.php     |   0
 .../HTMLPurifier/DoctypeRegistry.php          |   0
 .../HTMLPurifier/HTMLPurifier/ElementDef.php  |   7 ++
 .../HTMLPurifier/HTMLPurifier/Encoder.php     |   0
 .../HTMLPurifier/EntityLookup.php             |   0
 .../HTMLPurifier/EntityLookup/entities.ser    |   0
 .../HTMLPurifier/EntityParser.php             |   0
 .../HTMLPurifier/ErrorCollector.php           |   0
 .../HTMLPurifier/HTMLPurifier/ErrorStruct.php |   0
 .../HTMLPurifier/HTMLPurifier/Exception.php   |   0
 .../HTMLPurifier/HTMLPurifier/Filter.php      |   0
 .../Filter/ExtractStyleBlocks.php             |   0
 .../HTMLPurifier/Filter/YouTube.php           |  10 +-
 .../HTMLPurifier/HTMLPurifier/Generator.php   |  56 ++++++++++-
 .../HTMLPurifier/HTMLDefinition.php           |   7 +-
 .../HTMLPurifier/HTMLPurifier/HTMLModule.php  |   0
 .../HTMLPurifier/HTMLModule/Bdo.php           |   0
 .../HTMLModule/CommonAttributes.php           |   0
 .../HTMLPurifier/HTMLModule/Edit.php          |   0
 .../HTMLPurifier/HTMLModule/Forms.php         |   0
 .../HTMLPurifier/HTMLModule/Hypertext.php     |   0
 .../HTMLPurifier/HTMLModule/Image.php         |   0
 .../HTMLPurifier/HTMLModule/Legacy.php        |   0
 .../HTMLPurifier/HTMLModule/List.php          |   6 +-
 .../HTMLPurifier/HTMLModule/Name.php          |   0
 .../HTMLModule/NonXMLCommonAttributes.php     |   0
 .../HTMLPurifier/HTMLModule/Object.php        |   0
 .../HTMLPurifier/HTMLModule/Presentation.php  |   0
 .../HTMLPurifier/HTMLModule/Proprietary.php   |   0
 .../HTMLPurifier/HTMLModule/Ruby.php          |   0
 .../HTMLPurifier/HTMLModule/SafeEmbed.php     |   1 +
 .../HTMLPurifier/HTMLModule/SafeObject.php    |   5 +-
 .../HTMLPurifier/HTMLModule/Scripting.php     |   0
 .../HTMLModule/StyleAttribute.php             |   0
 .../HTMLPurifier/HTMLModule/Tables.php        |   0
 .../HTMLPurifier/HTMLModule/Target.php        |   0
 .../HTMLPurifier/HTMLModule/Text.php          |   0
 .../HTMLPurifier/HTMLModule/Tidy.php          |   0
 .../HTMLPurifier/HTMLModule/Tidy/Name.php     |   0
 .../HTMLModule/Tidy/Proprietary.php           |   1 +
 .../HTMLPurifier/HTMLModule/Tidy/Strict.php   |   0
 .../HTMLModule/Tidy/Transitional.php          |   0
 .../HTMLPurifier/HTMLModule/Tidy/XHTML.php    |   0
 .../HTMLModule/Tidy/XHTMLAndHTML4.php         |   0
 .../HTMLModule/XMLCommonAttributes.php        |   0
 .../HTMLPurifier/HTMLModuleManager.php        |   0
 .../HTMLPurifier/IDAccumulator.php            |   0
 .../HTMLPurifier/HTMLPurifier/Injector.php    |   0
 .../HTMLPurifier/Injector/AutoParagraph.php   |  21 ++--
 .../HTMLPurifier/Injector/DisplayLinkURI.php  |   0
 .../HTMLPurifier/Injector/Linkify.php         |   0
 .../HTMLPurifier/Injector/PurifierLinkify.php |   0
 .../HTMLPurifier/Injector/RemoveEmpty.php     |   0
 .../Injector/RemoveSpansWithoutAttributes.php |  60 +++++++++++
 .../HTMLPurifier/Injector/SafeObject.php      |   6 +-
 .../HTMLPurifier/HTMLPurifier/Language.php    |   0
 .../Language/classes/en-x-test.php            |   0
 .../Language/messages/en-x-test.php           |   0
 .../Language/messages/en-x-testmini.php       |   0
 .../HTMLPurifier/Language/messages/en.php     |   1 +
 .../HTMLPurifier/LanguageFactory.php          |   0
 .../HTMLPurifier/HTMLPurifier/Length.php      |   0
 .../HTMLPurifier/HTMLPurifier/Lexer.php       |  34 ++++++-
 .../HTMLPurifier/Lexer/DOMLex.php             |   0
 .../HTMLPurifier/Lexer/DirectLex.php          |   2 +-
 .../HTMLPurifier/Lexer/PEARSax3.php           |  37 ++++++-
 .../HTMLPurifier/HTMLPurifier/Lexer/PH5P.php  |   4 +-
 .../HTMLPurifier/PercentEncoder.php           |   0
 .../HTMLPurifier/HTMLPurifier/Printer.php     |   0
 .../HTMLPurifier/Printer/CSSDefinition.php    |   0
 .../HTMLPurifier/Printer/ConfigForm.css       |   0
 .../HTMLPurifier/Printer/ConfigForm.js        |   0
 .../HTMLPurifier/Printer/ConfigForm.php       |   0
 .../HTMLPurifier/Printer/HTMLDefinition.php   |   0
 .../HTMLPurifier/PropertyList.php             |   0
 .../HTMLPurifier/PropertyListIterator.php     |   0
 .../HTMLPurifier/HTMLPurifier/Strategy.php    |   0
 .../HTMLPurifier/Strategy/Composite.php       |   0
 .../HTMLPurifier/Strategy/Core.php            |   0
 .../HTMLPurifier/Strategy/FixNesting.php      |   0
 .../HTMLPurifier/Strategy/MakeWellFormed.php  |  18 ++++
 .../Strategy/RemoveForeignElements.php        |   0
 .../Strategy/ValidateAttributes.php           |   0
 .../HTMLPurifier/HTMLPurifier/StringHash.php  |   0
 .../HTMLPurifier/StringHashParser.php         |   0
 .../HTMLPurifier/TagTransform.php             |   0
 .../HTMLPurifier/TagTransform/Font.php        |   0
 .../HTMLPurifier/TagTransform/Simple.php      |   0
 .../HTMLPurifier/HTMLPurifier/Token.php       |   0
 .../HTMLPurifier/Token/Comment.php            |   0
 .../HTMLPurifier/HTMLPurifier/Token/Empty.php |   0
 .../HTMLPurifier/HTMLPurifier/Token/End.php   |   0
 .../HTMLPurifier/HTMLPurifier/Token/Start.php |   0
 .../HTMLPurifier/HTMLPurifier/Token/Tag.php   |   0
 .../HTMLPurifier/HTMLPurifier/Token/Text.php  |   0
 .../HTMLPurifier/TokenFactory.php             |   0
 .../HTMLPurifier/HTMLPurifier/URI.php         |   0
 .../HTMLPurifier/URIDefinition.php            |   0
 .../HTMLPurifier/HTMLPurifier/URIFilter.php   |   0
 .../URIFilter/DisableExternal.php             |   0
 .../URIFilter/DisableExternalResources.php    |   0
 .../URIFilter/DisableResources.php            |  11 +++
 .../HTMLPurifier/URIFilter/HostBlacklist.php  |   0
 .../HTMLPurifier/URIFilter/MakeAbsolute.php   |   0
 .../HTMLPurifier/URIFilter/Munge.php          |   0
 .../HTMLPurifier/HTMLPurifier/URIParser.php   |   0
 .../HTMLPurifier/HTMLPurifier/URIScheme.php   |   0
 .../HTMLPurifier/URIScheme/data.php           |  93 ++++++++++++++++++
 .../HTMLPurifier/URIScheme/file.php           |  26 +++++
 .../HTMLPurifier/URIScheme/ftp.php            |   0
 .../HTMLPurifier/URIScheme/http.php           |   0
 .../HTMLPurifier/URIScheme/https.php          |   0
 .../HTMLPurifier/URIScheme/mailto.php         |   0
 .../HTMLPurifier/URIScheme/news.php           |   0
 .../HTMLPurifier/URIScheme/nntp.php           |   0
 .../HTMLPurifier/URISchemeRegistry.php        |   0
 .../HTMLPurifier/UnitConverter.php            |   0
 .../HTMLPurifier/HTMLPurifier/VarParser.php   |   0
 .../HTMLPurifier/VarParser/Flexible.php       |   9 +-
 .../HTMLPurifier/VarParser/Native.php         |   0
 .../HTMLPurifier/VarParserException.php       |   0
 .../HTMLPurifier/HTMLPurifierLicense          |   0
 336 files changed, 622 insertions(+), 137 deletions(-)
 delete mode 100644 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema.ser
 delete mode 100644 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt
 delete mode 100644 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier.auto.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier.autoload.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier.func.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier.includes.php (97%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier.kses.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier.path.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier.php (98%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier.safe-includes.php (97%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrCollections.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef.php (71%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/CSS.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/CSS/AlphaValue.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Background.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php (85%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Border.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Color.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Composite.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Filter.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Font.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/CSS/FontFamily.php (51%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Length.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/CSS/ListStyle.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Multiple.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Number.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Percentage.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/CSS/TextDecoration.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/CSS/URI.php (79%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/Enum.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Bool.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Class.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Color.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/HTML/FrameTarget.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/HTML/ID.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Length.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/HTML/LinkTypes.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/HTML/MultiLength.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Nmtokens.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Pixels.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/Integer.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/Lang.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/Switch.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/Text.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/URI.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/URI/Email.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/URI/Host.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/URI/IPv4.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrDef/URI/IPv6.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrTransform.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrTransform/Background.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrTransform/BdoDir.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrTransform/BgColor.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrTransform/BoolToCSS.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrTransform/Border.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrTransform/EnumToCSS.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrTransform/ImgRequired.php (90%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrTransform/ImgSpace.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrTransform/Input.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrTransform/Lang.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrTransform/Length.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrTransform/Name.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrTransform/NameSync.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrTransform/SafeEmbed.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrTransform/SafeObject.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrTransform/SafeParam.php (74%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrTransform/ScriptRequired.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrTransform/Textarea.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrTypes.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/AttrValidator.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Bootstrap.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/CSSDefinition.php (95%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ChildDef.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ChildDef/Chameleon.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ChildDef/Custom.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ChildDef/Empty.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ChildDef/Optional.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ChildDef/Required.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ChildDef/StrictBlockquote.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ChildDef/Table.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Config.php (99%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/Builder/Xml.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/Exception.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/Interchange.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/Interchange/Directive.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/Interchange/Id.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/InterchangeBuilder.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/Validator.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/ValidatorAtom.php (100%)
 create mode 100644 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema.ser
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.AllowedClasses.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.ClassUseCDATA.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.DefaultImageAlt.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.ForbiddenClasses.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.DisplayLinkURI.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.DocURL.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.txt (100%)
 create mode 100644 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveSpansWithoutAttributes.txt
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.AllowImportant.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.AllowTricky.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt (100%)
 create mode 100644 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.ForbiddenProperties.txt
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.Language.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt (100%)
 create mode 100644 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.NormalizeNewlines.txt
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt (100%)
 create mode 100644 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.RemoveProcessingInstructions.txt
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.Custom.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Escaping.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Scope.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.TidyImpl.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt (65%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt (54%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt (100%)
 create mode 100644 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Attr.Name.UseCDATA.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt (100%)
 create mode 100644 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.FlashAllowFullScreen.txt
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenAttributes.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenElements.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt (65%)
 create mode 100644 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt (100%)
 create mode 100644 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.FlashCompat.txt
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.SortAttr.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt (74%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.Base.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt (64%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.Host.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.MungeResources.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/info.ini (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ContentSets.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Context.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Definition.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/DefinitionCache.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/DefinitionCache/Decorator.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/DefinitionCache/Decorator/Memory.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/DefinitionCache/Decorator/Template.php.in (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/DefinitionCache/Null.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/DefinitionCache/Serializer.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/DefinitionCache/Serializer/README (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/DefinitionCacheFactory.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Doctype.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/DoctypeRegistry.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ElementDef.php (96%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Encoder.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/EntityLookup.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/EntityLookup/entities.ser (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/EntityParser.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ErrorCollector.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/ErrorStruct.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Exception.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Filter.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Filter/ExtractStyleBlocks.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Filter/YouTube.php (74%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Generator.php (73%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLDefinition.php (97%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModule.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModule/Bdo.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModule/CommonAttributes.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModule/Edit.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModule/Forms.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModule/Hypertext.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModule/Image.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModule/Legacy.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModule/List.php (85%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModule/Name.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModule/Object.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModule/Presentation.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModule/Proprietary.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModule/Ruby.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModule/SafeEmbed.php (96%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModule/SafeObject.php (83%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModule/Scripting.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModule/StyleAttribute.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModule/Tables.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModule/Target.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModule/Text.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Name.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Proprietary.php (91%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Strict.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Transitional.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/XHTML.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModule/XMLCommonAttributes.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/HTMLModuleManager.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/IDAccumulator.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Injector.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Injector/AutoParagraph.php (95%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Injector/DisplayLinkURI.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Injector/Linkify.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Injector/PurifierLinkify.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Injector/RemoveEmpty.php (100%)
 create mode 100644 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Injector/SafeObject.php (93%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Language.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Language/classes/en-x-test.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Language/messages/en-x-test.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Language/messages/en-x-testmini.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Language/messages/en.php (98%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/LanguageFactory.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Length.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Lexer.php (90%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Lexer/DOMLex.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Lexer/DirectLex.php (99%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Lexer/PEARSax3.php (69%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Lexer/PH5P.php (99%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/PercentEncoder.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Printer.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Printer/CSSDefinition.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Printer/ConfigForm.css (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Printer/ConfigForm.js (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Printer/ConfigForm.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Printer/HTMLDefinition.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/PropertyList.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/PropertyListIterator.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Strategy.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Strategy/Composite.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Strategy/Core.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Strategy/FixNesting.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Strategy/MakeWellFormed.php (94%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Strategy/RemoveForeignElements.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Strategy/ValidateAttributes.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/StringHash.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/StringHashParser.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/TagTransform.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/TagTransform/Font.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/TagTransform/Simple.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Token.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Token/Comment.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Token/Empty.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Token/End.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Token/Start.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Token/Tag.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/Token/Text.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/TokenFactory.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/URI.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/URIDefinition.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/URIFilter.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/URIFilter/DisableExternal.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/URIFilter/DisableExternalResources.php (100%)
 create mode 100644 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIFilter/DisableResources.php
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/URIFilter/HostBlacklist.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/URIFilter/MakeAbsolute.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/URIFilter/Munge.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/URIParser.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/URIScheme.php (100%)
 create mode 100644 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIScheme/data.php
 create mode 100644 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIScheme/file.php
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/URIScheme/ftp.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/URIScheme/http.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/URIScheme/https.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/URIScheme/mailto.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/URIScheme/news.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/URIScheme/nntp.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/URISchemeRegistry.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/UnitConverter.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/VarParser.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/VarParser/Flexible.php (88%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/VarParser/Native.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifier/VarParserException.php (100%)
 rename 3.1/modules/purifier/{lib => vendor}/HTMLPurifier/HTMLPurifierLicense (100%)

diff --git a/3.1/modules/purifier/helpers/purifier.php b/3.1/modules/purifier/helpers/purifier.php
index 97742b50..2af53180 100644
--- a/3.1/modules/purifier/helpers/purifier.php
+++ b/3.1/modules/purifier/helpers/purifier.php
@@ -21,7 +21,7 @@ class purifier {
 
   static function purify($dirty_html) {
     if (!isset(self::$_purifier)) {
-      require_once(MODPATH . "purifier/lib/HTMLPurifier/HTMLPurifier.auto.php");
+      require_once(MODPATH . "purifier/vendor/HTMLPurifier/HTMLPurifier.auto.php");
       $config = HTMLPurifier_Config::createDefault();
       foreach (Kohana::config("purifier") as $category => $key_value) {
         foreach ($key_value as $key => $value) {
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema.ser b/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema.ser
deleted file mode 100644
index bbf12f9c3e7392aa8143727d2485f6f9ad1f97e1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12999
zcmeHO+in}l5#3KQw8%>U6QX2iW%@~`L@W{AAkxU@X)z>QRL8>^W-hX{hW|b1RCo0>
zheOKykN^Q_V_|8ky1KgV-Bo)#IC(!f`gMAJbypYm!J6XtVV*tM<z)V7R>{%ebnvYl
zoDGf^<{_!msyzCb3_hIkWB<e8=)9_m-g%nlU(I5eCS_@WaPzSooV?ovj*4Vurb)3h
zj>Pfc+jo$_-Z6=Llal@};8O$yOR`dS{al*i#rgEy?|tlH7mnxgDp{KIv}$pt(CjHm
z?Lv@_z&RH4pOar&L?Sey1@2D=M`QQ-jpZI(7o_6JPt9|6VGDwQo>uY`R|@x+Su#t_
z_~Pi}Y;eq7`yMdLi<w<4OctaX#PT<fGQRkfCi5?;Epal1o}6q$@6FOYuifdx&f|-_
z!aUgL=*WGQslu-Ec>;wrGNDrIDhG3`r0Vg<yQD~#MY4X>6Z9#!24`58RlbV&qsANX
zg)P@<@^WRfFQ4znfd(0AkO;L8FA6=S@EWMvt;gzJ<nzz>S6<#f{{{94u~KF`mnh+P
zo5#C1tNh7auGZB{&;5KeE7!ft=eb!|HqXQrPUs1cd9@&wKKH^eB8~n>Sa^%sZkoz~
zD6e5NLRJi_XgHZTmm9Cvc~K=9)bFf^?i8TY!p^@0q0z7c$Sm%Pd~J%#s=HEa1jA@;
zW_h}M18=i(qCTWY;C1pmUM;Uow&VfJ0Y3Lnj*r)3L%KI97uHls(d-SE8YYM*5qa<~
zmemJrVhRfv{KJTEoCNIV`(45vC9Xic!@MxP^X0NIWoe&G`ZBW5S0V(;UqnQVVV<UD
zUR@SNUO-n~L=>Qh=EdL5%h$YEh$bNds1j#dB}JZRJRpSf^Vu=~cylTY)a<^GM*1B~
z@*>Hc`*X=?bpGBg0qDgrIyS4gj=w=wc?#|oa(2v}_!}0j>tdZopkn|%;zK=uEN!C8
zNNzOZZy@;f(N<yANd6E4vrg?Q0JtFV03n)iR&L`USdt}A(4adkkLox8V3yVqE!`e~
z<llARi=Q1|093|>5ekQd94Rn7V*rac2@)u6`sD0^i-yPi>(7F46Br{cQlqEQZk%Q_
zEUgd+>Xpf=X^z~p<WIB#TF5CRESQMPFpw+rjM!mr>eb8?lb38h&MH$NDbW5Ilo>Mx
z|1z8B3!5#;2)M7Shqq_^nc>ADl=Eb5d`=iX+H_G+x<0n6>0ZWI(_|Tp^8^_+qH~jH
z=ab=hJbXluor9-<$Rs0(ze<j{ObyQ`W-I{-{FL*;uEUYRZCSn0q$mPrUOm$lEVuT#
z3k*7A=tF5jAF?rp^Ht62^8GroS%v=^!C`a3V4R^AT=4RuK-f^>v)qUfCc-94j>;W?
zG|1b?rZ{k~ojy*%m<L@xSCq<x$NH4!^Dkvj1S|USiUu>gu_trHK*#ldvQxWwiDZBS
z>?EqXrT{(CKl6H8&qVTKOb{~5Ev=fGuoi!1abRb4rSX|TF@`r97lFYXV(4|gsMD|%
z(sV%9YBwmudQG|HgCcxPP(+UZKsrZqpkYIPYxx%jB?#19pq?N=ek%vqd{Pzlys8Ut
zUlMXy_^8s!-wP8?^bHcalG4SeO~?fX|J(J|Fkh`;`H=)12916nSe&qHDa{>W-yJ~e
z5yXZH{5aV&_X(^?ek{mDu)3@P#d%Rxxj~MVuaFBRTzr(cPTRz4RH`_EvCYJbq>QXf
z?La+314WpGHz_d}7Ks}`Rar+urgh4~N%DXKXU447R1g7jJNp;HV*u%HP_~Ues}SfV
z=L=8@?CUOsTp1*4@&&e5W?^g8gkTcBB-;_iMT}^Dpj<#{5s&H%zj3LW*a=j1TUYD4
zLgHUB9JWJ?w<2)m@ovo56oKEX8m##56I4~ySvWZi#DmDEtA1nP)Ra{ZpXcT#AJ6j)
z3TUbg)V1pCa;KtSCJ@6n@sh`?f`>WQzyW`iD9=1aQ6-3jxgx-m9~yKVB+E8`HDCQ=
zm^|dctv@BDo)E|27k@Ev%uov;<k)al<8gc)7+j%Q-BBUJHe{JCd7lZ#hsQ>r5wT5?
zF|YcB=vl-ifU6XIZ_2!eEafP2DT2ZyGFxy@=GUATA#q#JE5CHyk?0zvcb$AO=d&_T
z5oeVr&+&CF^_<24!RDu}y%|^nbYkX(sZdlpHdq!Ac8hYPunSy4<(?d@fLdp4f}Jni
zP4&)Q=5Dty<-TCYO$mo|mvS8Pr@#KRNGcRvhdcS<PJXzPAMWJL8HYQ$q|U>goQeH#
zC*QbjAMWH&`aE&ClZT>@6_{K@e1+!Ax7OGA8pp!$a3@FYdbpFzWBB1t?mg&mCqLZD
zd1wDWzmp@Z;cmV5?`n+pI1s+f*~Vgez`Y&SmCYXTIFsNduFv<J(EDw7#O>hi88Zf!
zFpKDW&}LKI4v5p)65j=q7M-jDdqTO@4#&p7aAUln2-v^<G#zmuNYhd|Q-rA7t!=<p
zJL0}u2-(GZg$DR7Wmr~jPT&ZAQb-Kjx`$Y|7Ec<9dnBP$1p{wh(lmEZWcaP9<N*m!
zCwx1>2idG?q}u^c9NtbHfH-`~>f!+;zVOMWlbZCuY<ZsAq<LD~)1~*C!Zl3T+UU{S
z!3XLBWknmN9eS^ga4K!Ys|xtq<k!0Hz3<RF>4|wY?PE5)qxO6wm#7o2{T0s|ULYf2
zyE*SEkcVa$-*zX5lzXe+y{kFz7(Ru*8&c$T)oZQLZvKA7{ot<M%A~HE^R)KYbN%_*
z0A~p;&Z3sS?~rk(KsVXf|8ImJ+W1lb-$S9l0M-7#1MTVm``|>6=^O!gPtSmmwnqTe
zT>Z8iod&-x0#A4AUjq*j*e^uj@$brl|C*~dQv%IGohiUUwmdfQ(H<&LKH!zYN5@=2
zBzkh%nk(3b#&ZQQbf&`}X-<2IAtX9R=A1Jb)oH4oYy_ZJ+(3nie(J6kc&88inU1)a
z17fBy*>uG1;Do`Ac0wWTxOMw8s<1b(TqoRPAc;hDx;o)r?uyv%g!@3Oj5cj<7kaun
z+%yGEhO&8Qmm64;Qql4dr0qtxKLWjiqHqZ9Zj>j}(d%}xcz;W}>2$lz7-n`hr5of|
z%m=2olStHD?=~T%1-ID6addN9?fL%=8&J#cGx(Oj_jx+yPF#=rio||ow{CI4I`)g}
zzs<m2WwX!e!l^pN>8tu}*1RILAKbZ9ZX6%ksWZ)^UDFpnT(sVFxZ>?Q2Cf!>RhAB5
z07a^Im`nUh)HLip0?YpxAq+|=0XV6H^A6CO#PIwfcL~boB!-V!2(AKTSc!=11;D{J
z2OO|9Ls}?@qil(CSfS9ZEN-BF%t3;^iYAOXwDc<@!cb~l$#bqxO8MV2WH4=D<8)Dd
z|DHDh75tlbz2p9yDF*3EnLl)GV&UB%+hH`*2NJ5mn>;zZ>GzIzu5K_kS3_S4>N^&B
zr`SKh;qr=d&91+j(~Ye`6r!4J4{y8`nIdqA#1SlIbfcx=j#8>?Xu}%~d_stEoI{5;
zJV^J^gSXs(J}W~TK3zhKLW$q~$VN-quV35VQLP}9<(#buqYbHDK8ArHs8pvw0>Yz_
zi9_j%^J=H3A}=}{;@MP-oa$tVKbCr^e}!tkN+R}OyAA};)H`5{Mt2l~!|We6aa)IS
zXvav(epX%|Y3XE+hSHvJQAdYNw}xE2lwhwNLoObObs|FQLg!!hGtY?AL9d%*;C9T=
z_`M-(PEq(bl`uWwOu+-)l#8Ac<hTOSjQ`7m4!Sfh=7G_K%l696As6*oS*b%Vjcnvj
z?#Ebw@>-qF!L1ES-BLk#im-G%Mw1+^qXQgGs5t(3Q;P7m;GT?|o@vRUH9+Gk)9&#Z
ex0z?zkIyJIzlD6=+JDysjbHrQ5DoYJ{{26FNH2{5

diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt b/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt
deleted file mode 100644
index 888d5581..00000000
--- a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-HTML.AllowedElements
-TYPE: lookup/null
-VERSION: 1.3.0
-DEFAULT: NULL
---DESCRIPTION--
-<p>
-    If HTML Purifier's tag 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 a tag that HTML Purifier never
-    supported in the first place (like embed, form or head).  If you
-    change this, you probably also want to change %HTML.AllowedAttributes.
-</p>
-<p>
-    <strong>Warning:</strong> If another directive conflicts with the
-    elements here, <em>that</em> directive will win and override.
-</p>
---# vim: et sw=4 sts=4
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt b/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt
deleted file mode 100644
index 32967b88..00000000
--- a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-HTML.SafeObject
-TYPE: bool
-VERSION: 3.1.1
-DEFAULT: false
---DESCRIPTION--
-<p>
-    Whether or not to permit object tags in documents, with a number of extra
-    security features added to prevent script execution. This is similar to
-    what websites like MySpace do to object tags. You may also want to
-    enable %HTML.SafeEmbed for maximum interoperability with Internet Explorer,
-    although embed tags will cause your website to stop validating.
-    <strong>Highly experimental.</strong>
-</p>
---# vim: et sw=4 sts=4
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier.auto.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier.auto.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier.auto.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier.auto.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier.autoload.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier.autoload.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier.autoload.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier.autoload.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier.func.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier.func.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier.func.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier.func.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier.includes.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier.includes.php
similarity index 97%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier.includes.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier.includes.php
index e57f2ab3..08737c20 100644
--- a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier.includes.php
+++ b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier.includes.php
@@ -7,7 +7,7 @@
  * primary concern and you are using an opcode cache. PLEASE DO NOT EDIT THIS
  * FILE, changes will be overwritten the next time the script is run.
  *
- * @version 4.0.0
+ * @version 4.2.0
  *
  * @warning
  *      You must *not* include any other HTML Purifier files before this file,
@@ -176,6 +176,7 @@ require 'HTMLPurifier/Injector/DisplayLinkURI.php';
 require 'HTMLPurifier/Injector/Linkify.php';
 require 'HTMLPurifier/Injector/PurifierLinkify.php';
 require 'HTMLPurifier/Injector/RemoveEmpty.php';
+require 'HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php';
 require 'HTMLPurifier/Injector/SafeObject.php';
 require 'HTMLPurifier/Lexer/DOMLex.php';
 require 'HTMLPurifier/Lexer/DirectLex.php';
@@ -195,9 +196,12 @@ require 'HTMLPurifier/Token/Start.php';
 require 'HTMLPurifier/Token/Text.php';
 require 'HTMLPurifier/URIFilter/DisableExternal.php';
 require 'HTMLPurifier/URIFilter/DisableExternalResources.php';
+require 'HTMLPurifier/URIFilter/DisableResources.php';
 require 'HTMLPurifier/URIFilter/HostBlacklist.php';
 require 'HTMLPurifier/URIFilter/MakeAbsolute.php';
 require 'HTMLPurifier/URIFilter/Munge.php';
+require 'HTMLPurifier/URIScheme/data.php';
+require 'HTMLPurifier/URIScheme/file.php';
 require 'HTMLPurifier/URIScheme/ftp.php';
 require 'HTMLPurifier/URIScheme/http.php';
 require 'HTMLPurifier/URIScheme/https.php';
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier.kses.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier.kses.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier.kses.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier.kses.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier.path.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier.path.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier.path.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier.path.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier.php
similarity index 98%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier.php
index 71e90632..0430ad39 100644
--- a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier.php
+++ b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier.php
@@ -19,7 +19,7 @@
  */
 
 /*
-    HTML Purifier 4.0.0 - Standards Compliant HTML Filtering
+    HTML Purifier 4.2.0 - Standards Compliant HTML Filtering
     Copyright (C) 2006-2008 Edward Z. Yang
 
     This library is free software; you can redistribute it and/or
@@ -55,10 +55,10 @@ class HTMLPurifier
 {
 
     /** Version of HTML Purifier */
-    public $version = '4.0.0';
+    public $version = '4.2.0';
 
     /** Constant with version of HTML Purifier */
-    const VERSION = '4.0.0';
+    const VERSION = '4.2.0';
 
     /** Global configuration object */
     public $config;
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier.safe-includes.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier.safe-includes.php
similarity index 97%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier.safe-includes.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier.safe-includes.php
index 5f0e1d8f..899a1f2e 100644
--- a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier.safe-includes.php
+++ b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier.safe-includes.php
@@ -170,6 +170,7 @@ require_once $__dir . '/HTMLPurifier/Injector/DisplayLinkURI.php';
 require_once $__dir . '/HTMLPurifier/Injector/Linkify.php';
 require_once $__dir . '/HTMLPurifier/Injector/PurifierLinkify.php';
 require_once $__dir . '/HTMLPurifier/Injector/RemoveEmpty.php';
+require_once $__dir . '/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php';
 require_once $__dir . '/HTMLPurifier/Injector/SafeObject.php';
 require_once $__dir . '/HTMLPurifier/Lexer/DOMLex.php';
 require_once $__dir . '/HTMLPurifier/Lexer/DirectLex.php';
@@ -189,9 +190,12 @@ require_once $__dir . '/HTMLPurifier/Token/Start.php';
 require_once $__dir . '/HTMLPurifier/Token/Text.php';
 require_once $__dir . '/HTMLPurifier/URIFilter/DisableExternal.php';
 require_once $__dir . '/HTMLPurifier/URIFilter/DisableExternalResources.php';
+require_once $__dir . '/HTMLPurifier/URIFilter/DisableResources.php';
 require_once $__dir . '/HTMLPurifier/URIFilter/HostBlacklist.php';
 require_once $__dir . '/HTMLPurifier/URIFilter/MakeAbsolute.php';
 require_once $__dir . '/HTMLPurifier/URIFilter/Munge.php';
+require_once $__dir . '/HTMLPurifier/URIScheme/data.php';
+require_once $__dir . '/HTMLPurifier/URIScheme/file.php';
 require_once $__dir . '/HTMLPurifier/URIScheme/ftp.php';
 require_once $__dir . '/HTMLPurifier/URIScheme/http.php';
 require_once $__dir . '/HTMLPurifier/URIScheme/https.php';
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrCollections.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrCollections.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrCollections.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrCollections.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef.php
similarity index 71%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef.php
index 7fac54e8..6f82201e 100644
--- a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef.php
+++ b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef.php
@@ -82,6 +82,42 @@ abstract class HTMLPurifier_AttrDef
         return preg_replace('/rgb\((\d+)\s*,\s*(\d+)\s*,\s*(\d+)\)/', 'rgb(\1,\2,\3)', $string);
     }
 
+    /**
+     * Parses a possibly escaped CSS string and returns the "pure" 
+     * version of it.
+     */
+    protected function expandCSSEscape($string) {
+        // flexibly parse it
+        $ret = '';
+        for ($i = 0, $c = strlen($string); $i < $c; $i++) {
+            if ($string[$i] === '\\') {
+                $i++;
+                if ($i >= $c) {
+                    $ret .= '\\';
+                    break;
+                }
+                if (ctype_xdigit($string[$i])) {
+                    $code = $string[$i];
+                    for ($a = 1, $i++; $i < $c && $a < 6; $i++, $a++) {
+                        if (!ctype_xdigit($string[$i])) break;
+                        $code .= $string[$i];
+                    }
+                    // We have to be extremely careful when adding
+                    // new characters, to make sure we're not breaking
+                    // the encoding.
+                    $char = HTMLPurifier_Encoder::unichr(hexdec($code));
+                    if (HTMLPurifier_Encoder::cleanUTF8($char) === '') continue;
+                    $ret .= $char;
+                    if ($i < $c && trim($string[$i]) !== '') $i--;
+                    continue;
+                }
+                if ($string[$i] === "\n") continue;
+            }
+            $ret .= $string[$i];
+        }
+        return $ret;
+    }
+
 }
 
 // vim: et sw=4 sts=4
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/AlphaValue.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/AlphaValue.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/AlphaValue.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/AlphaValue.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Background.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Background.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Background.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Background.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php
similarity index 85%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php
index e067a754..665321e3 100644
--- a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php
+++ b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php
@@ -59,7 +59,8 @@ class HTMLPurifier_AttrDef_CSS_BackgroundPosition extends HTMLPurifier_AttrDef
         $keywords = array();
         $keywords['h'] = false; // left, right
         $keywords['v'] = false; // top, bottom
-        $keywords['c'] = false; // center
+        $keywords['ch'] = false; // center (first word)
+        $keywords['cv'] = false; // center (second word)
         $measures = array();
 
         $i = 0;
@@ -79,6 +80,13 @@ class HTMLPurifier_AttrDef_CSS_BackgroundPosition extends HTMLPurifier_AttrDef
             $lbit = ctype_lower($bit) ? $bit : strtolower($bit);
             if (isset($lookup[$lbit])) {
                 $status = $lookup[$lbit];
+                if ($status == 'c') {
+                    if ($i == 0) {
+                        $status = 'ch';
+                    } else {
+                        $status = 'cv';
+                    }
+                }
                 $keywords[$status] = $lbit;
                 $i++;
             }
@@ -101,20 +109,19 @@ class HTMLPurifier_AttrDef_CSS_BackgroundPosition extends HTMLPurifier_AttrDef
 
         if (!$i) return false; // no valid values were caught
 
-
         $ret = array();
 
         // first keyword
         if     ($keywords['h'])     $ret[] = $keywords['h'];
-        elseif (count($measures))   $ret[] = array_shift($measures);
-        elseif ($keywords['c']) {
-            $ret[] = $keywords['c'];
-            $keywords['c'] = false; // prevent re-use: center = center center
+        elseif ($keywords['ch']) {
+            $ret[] = $keywords['ch'];
+            $keywords['cv'] = false; // prevent re-use: center = center center
         }
+        elseif (count($measures))   $ret[] = array_shift($measures);
 
         if     ($keywords['v'])     $ret[] = $keywords['v'];
+        elseif ($keywords['cv'])    $ret[] = $keywords['cv'];
         elseif (count($measures))   $ret[] = array_shift($measures);
-        elseif ($keywords['c'])     $ret[] = $keywords['c'];
 
         if (empty($ret)) return false;
         return implode(' ', $ret);
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Border.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Border.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Border.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Border.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Color.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Color.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Color.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Color.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Composite.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Composite.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Composite.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Composite.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Filter.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Filter.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Filter.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Filter.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Font.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Font.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Font.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Font.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/FontFamily.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/FontFamily.php
similarity index 51%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/FontFamily.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/FontFamily.php
index 33435c76..f1ceec4a 100644
--- a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/FontFamily.php
+++ b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/FontFamily.php
@@ -34,37 +34,10 @@ class HTMLPurifier_AttrDef_CSS_FontFamily extends HTMLPurifier_AttrDef
                 $quote = $font[0];
                 if ($font[$length - 1] !== $quote) continue;
                 $font = substr($font, 1, $length - 2);
-
-                $new_font = '';
-                for ($i = 0, $c = strlen($font); $i < $c; $i++) {
-                    if ($font[$i] === '\\') {
-                        $i++;
-                        if ($i >= $c) {
-                            $new_font .= '\\';
-                            break;
-                        }
-                        if (ctype_xdigit($font[$i])) {
-                            $code = $font[$i];
-                            for ($a = 1, $i++; $i < $c && $a < 6; $i++, $a++) {
-                                if (!ctype_xdigit($font[$i])) break;
-                                $code .= $font[$i];
-                            }
-                            // We have to be extremely careful when adding
-                            // new characters, to make sure we're not breaking
-                            // the encoding.
-                            $char = HTMLPurifier_Encoder::unichr(hexdec($code));
-                            if (HTMLPurifier_Encoder::cleanUTF8($char) === '') continue;
-                            $new_font .= $char;
-                            if ($i < $c && trim($font[$i]) !== '') $i--;
-                            continue;
-                        }
-                        if ($font[$i] === "\n") continue;
-                    }
-                    $new_font .= $font[$i];
-                }
-
-                $font = $new_font;
             }
+
+            $font = $this->expandCSSEscape($font);
+
             // $font is a pure representation of the font name
 
             if (ctype_alnum($font) && $font !== '') {
@@ -73,12 +46,21 @@ class HTMLPurifier_AttrDef_CSS_FontFamily extends HTMLPurifier_AttrDef
                 continue;
             }
 
-            // complicated font, requires quoting
+            // bugger out on whitespace.  form feed (0C) really
+            // shouldn't show up regardless
+            $font = str_replace(array("\n", "\t", "\r", "\x0C"), ' ', $font);
 
-            // armor single quotes and new lines
-            $font = str_replace("\\", "\\\\", $font);
-            $font = str_replace("'", "\\'", $font);
-            $final .= "'$font', ";
+            // These ugly transforms don't pose a security
+            // risk (as \\ and \" might).  We could try to be clever and
+            // use single-quote wrapping when there is a double quote
+            // present, but I have choosen not to implement that.
+            // (warning: this code relies on the selection of quotation
+            // mark below)
+            $font = str_replace('\\', '\\5C ', $font);
+            $font = str_replace('"',  '\\22 ', $font);
+
+            // complicated font, requires quoting
+            $final .= "\"$font\", "; // note that this will later get turned into &quot;
         }
         $final = rtrim($final, ', ');
         if ($final === '') return false;
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Length.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Length.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Length.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Length.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/ListStyle.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/ListStyle.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/ListStyle.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/ListStyle.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Multiple.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Multiple.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Multiple.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Multiple.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Number.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Number.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Number.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Number.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Percentage.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Percentage.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Percentage.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/Percentage.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/TextDecoration.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/TextDecoration.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/TextDecoration.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/TextDecoration.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/URI.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/URI.php
similarity index 79%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/URI.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/URI.php
index d09c87bc..98df033d 100644
--- a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/CSS/URI.php
+++ b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/CSS/URI.php
@@ -34,20 +34,16 @@ class HTMLPurifier_AttrDef_CSS_URI extends HTMLPurifier_AttrDef_URI
             $uri = substr($uri, 1, $new_length - 1);
         }
 
-        $keys   = array(  '(',   ')',   ',',   ' ',   '"',   "'");
-        $values = array('\\(', '\\)', '\\,', '\\ ', '\\"', "\\'");
-        $uri = str_replace($values, $keys, $uri);
+        $uri = $this->expandCSSEscape($uri);
 
         $result = parent::validate($uri, $config, $context);
 
         if ($result === false) return false;
 
-        // escape necessary characters according to CSS spec
-        // except for the comma, none of these should appear in the
-        // URI at all
-        $result = str_replace($keys, $values, $result);
+        // extra sanity check; should have been done by URI
+        $result = str_replace(array('"', "\\", "\n", "\x0c", "\r"), "", $result);
 
-        return "url($result)";
+        return "url(\"$result\")";
 
     }
 
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/Enum.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/Enum.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/Enum.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/Enum.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Bool.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Bool.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Bool.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Bool.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Class.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Class.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Class.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Class.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Color.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Color.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Color.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Color.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/FrameTarget.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/HTML/FrameTarget.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/FrameTarget.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/HTML/FrameTarget.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/ID.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/HTML/ID.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/ID.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/HTML/ID.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Length.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Length.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Length.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Length.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/LinkTypes.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/HTML/LinkTypes.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/LinkTypes.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/HTML/LinkTypes.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/MultiLength.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/HTML/MultiLength.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/MultiLength.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/HTML/MultiLength.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Nmtokens.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Nmtokens.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Nmtokens.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Nmtokens.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Pixels.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Pixels.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Pixels.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/HTML/Pixels.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/Integer.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/Integer.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/Integer.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/Integer.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/Lang.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/Lang.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/Lang.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/Lang.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/Switch.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/Switch.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/Switch.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/Switch.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/Text.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/Text.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/Text.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/Text.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/URI.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/URI.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/URI.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/URI.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/URI/Email.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/URI/Email.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/URI/Email.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/URI/Email.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/URI/Host.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/URI/Host.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/URI/Host.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/URI/Host.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/URI/IPv4.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/URI/IPv4.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/URI/IPv4.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/URI/IPv4.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/URI/IPv6.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/URI/IPv6.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrDef/URI/IPv6.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrDef/URI/IPv6.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/Background.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/Background.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/Background.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/Background.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/BdoDir.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/BdoDir.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/BdoDir.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/BdoDir.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/BgColor.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/BgColor.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/BgColor.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/BgColor.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/BoolToCSS.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/BoolToCSS.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/BoolToCSS.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/BoolToCSS.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/Border.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/Border.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/Border.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/Border.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/EnumToCSS.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/EnumToCSS.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/EnumToCSS.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/EnumToCSS.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/ImgRequired.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/ImgRequired.php
similarity index 90%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/ImgRequired.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/ImgRequired.php
index a1e5a83a..3d09eca3 100644
--- a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/ImgRequired.php
+++ b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/ImgRequired.php
@@ -24,7 +24,8 @@ class HTMLPurifier_AttrTransform_ImgRequired extends HTMLPurifier_AttrTransform
             if ($src) {
                 $alt = $config->get('Attr.DefaultImageAlt');
                 if ($alt === null) {
-                    $attr['alt'] = basename($attr['src']);
+                    // truncate if the alt is too long
+                    $attr['alt'] = substr(basename($attr['src']),0,40);
                 } else {
                     $attr['alt'] = $alt;
                 }
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/ImgSpace.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/ImgSpace.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/ImgSpace.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/ImgSpace.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/Input.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/Input.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/Input.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/Input.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/Lang.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/Lang.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/Lang.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/Lang.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/Length.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/Length.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/Length.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/Length.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/Name.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/Name.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/Name.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/Name.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/NameSync.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/NameSync.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/NameSync.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/NameSync.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/SafeEmbed.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/SafeEmbed.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/SafeEmbed.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/SafeEmbed.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/SafeObject.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/SafeObject.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/SafeObject.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/SafeObject.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/SafeParam.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/SafeParam.php
similarity index 74%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/SafeParam.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/SafeParam.php
index e677feae..d14390bc 100644
--- a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/SafeParam.php
+++ b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/SafeParam.php
@@ -33,12 +33,25 @@ class HTMLPurifier_AttrTransform_SafeParam extends HTMLPurifier_AttrTransform
             case 'allowNetworking':
                 $attr['value'] = 'internal';
                 break;
+            case 'allowFullScreen':
+                if ($config->get('HTML.FlashAllowFullScreen')) {
+                    $attr['value'] = ($attr['value'] == 'true') ? 'true' : 'false';
+                } else {
+                    $attr['value'] = 'false';
+                }
+                break;
             case 'wmode':
                 $attr['value'] = 'window';
                 break;
             case 'movie':
+            case 'src':
+                $attr['name'] = "movie";
                 $attr['value'] = $this->uri->validate($attr['value'], $config, $context);
                 break;
+            case 'flashvars':
+                // we're going to allow arbitrary inputs to the SWF, on
+                // the reasoning that it could only hack the SWF, not us.
+                break;
             // add other cases to support other param name/value pairs
             default:
                 $attr['name'] = $attr['value'] = null;
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/ScriptRequired.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/ScriptRequired.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/ScriptRequired.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/ScriptRequired.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/Textarea.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/Textarea.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTransform/Textarea.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTransform/Textarea.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTypes.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTypes.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrTypes.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrTypes.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrValidator.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrValidator.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/AttrValidator.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/AttrValidator.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Bootstrap.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Bootstrap.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Bootstrap.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Bootstrap.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/CSSDefinition.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/CSSDefinition.php
similarity index 95%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/CSSDefinition.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/CSSDefinition.php
index 17bf9931..09afc1f1 100644
--- a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/CSSDefinition.php
+++ b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/CSSDefinition.php
@@ -272,20 +272,29 @@ class HTMLPurifier_CSSDefinition extends HTMLPurifier_Definition
         // setup allowed elements
         $support = "(for information on implementing this, see the ".
                    "support forums) ";
-        $allowed_attributes = $config->get('CSS.AllowedProperties');
-        if ($allowed_attributes !== null) {
+        $allowed_properties = $config->get('CSS.AllowedProperties');
+        if ($allowed_properties !== null) {
             foreach ($this->info as $name => $d) {
-                if(!isset($allowed_attributes[$name])) unset($this->info[$name]);
-                unset($allowed_attributes[$name]);
+                if(!isset($allowed_properties[$name])) unset($this->info[$name]);
+                unset($allowed_properties[$name]);
             }
             // emit errors
-            foreach ($allowed_attributes as $name => $d) {
+            foreach ($allowed_properties as $name => $d) {
                 // :TODO: Is this htmlspecialchars() call really necessary?
                 $name = htmlspecialchars($name);
                 trigger_error("Style attribute '$name' is not supported $support", E_USER_WARNING);
             }
         }
 
+        $forbidden_properties = $config->get('CSS.ForbiddenProperties');
+        if ($forbidden_properties !== null) {
+            foreach ($this->info as $name => $d) {
+                if (isset($forbidden_properties[$name])) {
+                    unset($this->info[$name]);
+                }
+            }
+        }
+
     }
 }
 
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ChildDef.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ChildDef.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ChildDef.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ChildDef.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ChildDef/Chameleon.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ChildDef/Chameleon.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ChildDef/Chameleon.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ChildDef/Chameleon.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ChildDef/Custom.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ChildDef/Custom.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ChildDef/Custom.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ChildDef/Custom.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ChildDef/Empty.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ChildDef/Empty.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ChildDef/Empty.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ChildDef/Empty.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ChildDef/Optional.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ChildDef/Optional.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ChildDef/Optional.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ChildDef/Optional.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ChildDef/Required.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ChildDef/Required.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ChildDef/Required.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ChildDef/Required.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ChildDef/StrictBlockquote.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ChildDef/StrictBlockquote.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ChildDef/StrictBlockquote.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ChildDef/StrictBlockquote.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ChildDef/Table.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ChildDef/Table.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ChildDef/Table.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ChildDef/Table.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Config.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Config.php
similarity index 99%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Config.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Config.php
index 28529e7f..ada1b701 100644
--- a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Config.php
+++ b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Config.php
@@ -20,7 +20,7 @@ class HTMLPurifier_Config
     /**
      * HTML Purifier's version
      */
-    public $version = '4.0.0';
+    public $version = '4.2.0';
 
     /**
      * Bool indicator whether or not to automatically finalize
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/Builder/Xml.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/Builder/Xml.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/Builder/Xml.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/Builder/Xml.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/Exception.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/Exception.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/Exception.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/Exception.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/Interchange.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/Interchange.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/Interchange.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/Interchange.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/Interchange/Directive.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/Interchange/Directive.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/Interchange/Directive.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/Interchange/Directive.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/Interchange/Id.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/Interchange/Id.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/Interchange/Id.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/Interchange/Id.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/InterchangeBuilder.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/InterchangeBuilder.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/InterchangeBuilder.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/InterchangeBuilder.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/Validator.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/Validator.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/Validator.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/Validator.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/ValidatorAtom.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/ValidatorAtom.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/ValidatorAtom.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/ValidatorAtom.php
diff --git a/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema.ser b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema.ser
new file mode 100644
index 0000000000000000000000000000000000000000..978089c6291e7d828f6233ac632cedd8a98fdfd7
GIT binary patch
literal 13701
zcmeHO+in{<5}i*8JlK~7B1m?!lTn@=*+PW%4VHtMeHyeRTIRadt?i3rZ;*fAbBaYa
z)oRI^hh1O+IS4Fu6^q5Xk*q$x9v;6R9(}&Mytt_gdv8tg$0*P4?Q%MQFstNfcryG}
z4nGW!7Un*w)2clBm<$K~cYHedb$E1IRYmVKP4lm2F-nuNG~l@USPqZhZ4$>tvNCr`
zu{2IbfB5Y?L}2n*#H~p=!7k!cM1)Q<QfB>9n$g+m-KoyqSK66Vda_EE<}|HZnt5vW
zl%#ecOh?chgZb<DmzI!-O=Lm)li|_CJ$_?32ge1gsQ5ecT%Fm1B(SHIeBwya{ya-&
zshOM|eVh&ZoOPgtabC>qVqvmi)nJytDa+*SQ<}^lQ(IzXo_c(|O}#Zs^SpMe4>M2B
zZVGd6pQ9xYyiGmrBA+L4NMjQ^wXSj~w@RuWKi(uovMiGIgI~dbc58S>by?-BNI!bK
zA)ncDohC0AHhcVXI|(wVNW(;`y?^o46B@6f`oLAL-dR5Xa(kin{`oJ6N0^m1+d0Gw
zez&>2TeHfa%=v0vz4YAYt6913oj=dby0UpDxp2%(fX%A~r3^S1zKAsj9}(d#WxHj1
z1;lxcnh~?-IAPAUIi~9*D}S@qLta;mDm$wy=AjEIdUZ6Nx-6Zn)_GAS86rlh@JFED
z6?Xm@?95mUB(u0F^0g@{>oc5=CK+*VGfRWq8YHN7Mu3k<3}GCP_OUvESIBgkJWp23
z3zIErxN?ZcgX4aGEwRZGK_&_)tf`WsQ4py*N>HdG9k4)&*a2u$Q&^<-zm4SFao}#A
z-z1z->J{8J$_vvwT`mh#miEb{FJt?BA(o<F#g60{<!Nf>)p=3m#io^&niqdJFJJRw
zArS&QAw;mIRZ`@6#s$K1KY!@+N5ix*2p{)+Joe8qBrlT8l@$&dk5AvbAt1dNR^4V4
z$MGA?m8a0&Q$F-L6Te~5x-QmfMCya6jQ92Yp|pt~MsedYzd_*F2U~?vWBDNk>5|%2
zAaFp?0Y)@ot(?YDFeFQ!;6b-oF4buO!Yr*LS$=vDl7H1fFFtm9flwJ&o@g8ja-yK{
zjD<0tBv_!d>642G4jT3OPuGGn78Ii_N@E5yZk%T`46RUK>Xpf=yBvGklAoAMjF1yp
zSU6Gd5g-@l88yjV)vK8)rZ3ril2xX_X2T?5v1ct7{_|{}FKo7?BGA6B?%#gkXO=C;
zP|lOJ(Y<E$VADlG>*}82L-#!9x=WTJIFC^^A~{!ib~+tRCZh)w?>Te|jNH70@w4nb
z=c(cPB#fodL7#G7*mYPkv@NR_h7?V}9o?_#0+Czmo(Kh9Fbv={kq_IL!sV(zEy(lB
z#AX%#H-^LH8~J&~y@yGCWxl2`ujnpym*t9na%EGEg~Aft<5hDEC@6C#dbXToWmVL3
zt?6o1tSpi?l~v<tR5^Q4B`$SrQ`oQ9-sMiPP9>c`S2XgJR{E6Y^T)C$eiC<U+(7f)
z+|xPgt~0`Zv3GXy5}6bW*eTS94*j7_|H$jRdM1vP*o4n`EcA!F#tZS&c()NRAy;C0
z6F_1xL|06`%ola)x07R7(-C>3yuxX**PQBfuR_WSi`eluoI0=}F;8H>wfshW3IjbC
zq$jAi-^w8-pNgC7Lc>)m7|&-uLa5&hH@WB;EOa3!EZyB<7v#_HmlvaawL&6o?6<N{
zK*~O{<aF0iW)Jpiw*Wadq105+$Jw6yt<ahcm*++?tRL2pqP=+FUAZC7pZj}b9NQn{
z2tTgV6oD><TeASGmpQ{e9<SH$<2<%(ay5SUJVE=-%^s%(?DTXYd?+$-pp=p-$K{2^
zi2_9L*N#H~Ls$k*lY1Q2X52|NT#x~Qay|PeN^&6i*$@#ndh8d%R61QiQc&N|Ldu1~
z;edKUt(95W8s}Rm>8B%$D>2ddAi02NBOQIh{7y}M93I1;*LAh7D;zdfEWz#i<ARal
zqI}{-Ft3wlk<eMGS}QeLpr}5d;xI^$2D>1}l*CoIbAC*`GiAj?-P~N|lX;%OJ!)*I
zf)l(i7jk`MY9}z#H%YXIszQ=F#i0SehT2U-CMc!3XFxHyZ`iSrEZh8QzUp9PjZXb3
zDWg=OGI|Ab%Fss;<kWC6r966k4cP=EY*ON6LgWb1mb|%z<s<2%$0+)y$hgyM9;u4B
z?r@YR-<mS7VM|$xT>lUbk(e#Iius)L$|sqxy7EcKZIFpWd6&tfIh~bxii?5QNj1K#
z<%H?Wh;Z}K*4zxXK%E-Yi3-PDrv?uyq+R2HRM-VB+tLvTQ9!S=ydet~?oNK=uC3SG
z{Rh1%;7*7|y8Z(e`O{y2S|k;Yfrs{kYh}QiNRmVQ;n03Kv>y)bhqyU$Xg>^(4(*3S
z`{B@jKxYC+%|rV^&&s^sM=g!eAmG{e(0(|y9~c{l_5*SOH$CkF9NG`AYj9{kus!jA
z-hM#+M;l?S4MtXdEC^5Le22(A0woX~BAeZ#4~0I1dvh0F=(k}GcKG%KcMc3;56!o}
zHjxf?NS;od!!DA%M3qrcPb9Z64w(2CPK;)ekhRU#z#PCJZ$!Lio*{xTgcr5wt!xO1
zcm(F)-sc7*sHlKyxTX!u%7H(Qa25R~Hgs)kHx@G_t{+6J3I{qDf`oA0Kzu7I>6M{N
z#BB%<M5hKFVTW9CXd*iTdDyh;(g7kK*`4Z?CNCdtd79d!=_2ldUZ|(g<Px<ufERZ7
zD}8~^R-5Kw7wV0$Dvz%4F5ulw$2v%c!Y=epI-S_O@#n_~bJ5r(;_+{zR5dhPBVrqI
zp%SP=GmBy=s3Gm%0x|4DTsVbK7*RnKbzSvZBRoW7zvF&z)^2CgS3!yP{C-`39`NBJ
zp`}@b)6kcX1d8}c_JKOoyeLeOvQFGCP)Fl0q9UXwMW7C)!sUVLK^=~?2h^eUj7i49
z$n;HI$9u*(@`}XpK1jQ@f(mKUge>hBJyMc7(HyE7%2_v>!<REM@C9$9nee|>02<&&
zGtk3Cu-2_Q5cFu{M7$ozb<v{(DiV2znzo=K+tj#MgY@Ah`y+S*wHQi+Q)Es^5?|kW
za01HOE6L@JiFew&Pz{}#^=Cj1j2M<ZQL+I!*x@ll2`TCbF>Ij$H|QF@u{*#G%7N^O
z<aB`>)b5_K4Q|l5^@=vg1y|6zKnn~7zs1VroxlZf$wuwh(1BghHQ=q1h;g|eV;39)
zD^A3)3%j7wnEnhutt2h%f@(#_=)3>T4P!sbpaCy5n(f3HG|aC=BO-aHkO(i)9g*0(
z++eraY_~lAH)_C#yVsy74lN<f@twTN`ijMVWVUW|Av*S(>%XnQUT5>Yv#ZWN$4*}L
zZ!_i<qy6B_opvK&VyDmiX5R&<ad{F@7<!H1h_~-p2T>j3wiJ(o9>EC~xndw(VwMJ8
zp$t5p#|)vh<pm(u9i11I7Pv<B!&WFPo8THPfvD9&WLb%X`&){mZDLk1wZLJ#+-UQ~
zncY+2TN&I?^<}&49o{qnxzh5lpwr>h__{&lr`$LG$gm-LKmoLfE+OxEP4R|*^RCw)
zytxC^vJ@Drdu=be>#`k3gB6j=58VW`@n+EL?;PE5Y>tM%JZa!m<i+O|OpaD}tXE7H
z&S0AnBLU+L7kJ{35wCf-Y#r0Y@Te{_2P&$daav)pfy2@G@oGgl9Hk&}L>MU^hodAv
zkGGCK_UbdS1&5<sw4Z~|6@}A^h}SQm^0x~Rl;xRVA?QqKnA+t-0D{5q9@x_WR*V2w
z1<Jrns$Ug#aT_h8T5KEC_h27gmQP~^`!r8wx7Md!3qtz(+iXilcd0^F?Qh_@slyR$
zN1JcIDzCQ*JC)l7T2gDkGpc$3E%{mjiz}(YE$Jvkvy$izL_PjKA=G4y69dPj{Y&E=
zs6$@&dcfNOi&Dkl2?ArZ=m$WI3lt?f;F4b@#Bl@)BLCpVW0#r)RAK~L+8()maU;G?
zMta<m>Id6M??I7CV0rE4uqCP6DyVSLd>--SeZtu3AV;7hryuWb5#JVF#W+Az%ML9}
kl<S6cBcj}7s<I-YyfmFco^H**3lyb;U&BRl-tXW411LHn%>V!Z

literal 0
HcmV?d00001

diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.AllowedClasses.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.AllowedClasses.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.AllowedClasses.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.AllowedClasses.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.ClassUseCDATA.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.ClassUseCDATA.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.ClassUseCDATA.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.ClassUseCDATA.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.DefaultImageAlt.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.DefaultImageAlt.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.DefaultImageAlt.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.DefaultImageAlt.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.ForbiddenClasses.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.ForbiddenClasses.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.ForbiddenClasses.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.ForbiddenClasses.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.DisplayLinkURI.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.DisplayLinkURI.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.DisplayLinkURI.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.DisplayLinkURI.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.DocURL.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.DocURL.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.DocURL.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.DocURL.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.txt
diff --git a/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveSpansWithoutAttributes.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveSpansWithoutAttributes.txt
new file mode 100644
index 00000000..dde990ab
--- /dev/null
+++ b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveSpansWithoutAttributes.txt
@@ -0,0 +1,11 @@
+AutoFormat.RemoveSpansWithoutAttributes
+TYPE: bool
+VERSION: 4.0.1
+DEFAULT: false
+--DESCRIPTION--
+<p>
+  This directive causes <code>span</code> tags without any attributes
+  to be removed. It will also remove spans that had all attributes
+  removed during processing.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.AllowImportant.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.AllowImportant.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.AllowImportant.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.AllowImportant.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.AllowTricky.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.AllowTricky.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.AllowTricky.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.AllowTricky.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt
diff --git a/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.ForbiddenProperties.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.ForbiddenProperties.txt
new file mode 100644
index 00000000..f1f5c5f1
--- /dev/null
+++ b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.ForbiddenProperties.txt
@@ -0,0 +1,13 @@
+CSS.ForbiddenProperties
+TYPE: lookup
+VERSION: 4.2.0
+DEFAULT: array()
+--DESCRIPTION--
+<p>
+    This is the logical inverse of %CSS.AllowedProperties, and it will
+    override that directive or any other directive.  If possible,
+    %CSS.AllowedProperties is recommended over this directive,
+    because it can sometimes be difficult to tell whether or not you've
+    forbidden all of the CSS properties you truly would like to disallow.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.Language.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.Language.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.Language.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.Language.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt
diff --git a/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.NormalizeNewlines.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.NormalizeNewlines.txt
new file mode 100644
index 00000000..d77f5360
--- /dev/null
+++ b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.NormalizeNewlines.txt
@@ -0,0 +1,11 @@
+Core.NormalizeNewlines
+TYPE: bool
+VERSION: 4.2.0
+DEFAULT: true
+--DESCRIPTION--
+<p>
+    Whether or not to normalize newlines to the operating
+    system default.  When <code>false</code>, HTML Purifier
+    will attempt to preserve mixed newline files.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt
diff --git a/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.RemoveProcessingInstructions.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.RemoveProcessingInstructions.txt
new file mode 100644
index 00000000..3397d9f7
--- /dev/null
+++ b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.RemoveProcessingInstructions.txt
@@ -0,0 +1,11 @@
+Core.RemoveProcessingInstructions
+TYPE: bool
+VERSION: 4.2.0
+DEFAULT: false
+--DESCRIPTION--
+Instead of escaping processing instructions in the form <code>&lt;? ...
+?&gt;</code>, remove it out-right.  This may be useful if the HTML
+you are validating contains XML processing instruction gunk, however,
+it can also be user-unfriendly for people attempting to post PHP
+snippets.
+--# vim: et sw=4 sts=4
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.Custom.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.Custom.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.Custom.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.Custom.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Escaping.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Escaping.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Escaping.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Escaping.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Scope.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Scope.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Scope.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Scope.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.TidyImpl.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.TidyImpl.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.TidyImpl.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.TidyImpl.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt
similarity index 65%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt
index 7fa6536b..321eaa2d 100644
--- a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt
+++ b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt
@@ -3,6 +3,11 @@ TYPE: bool
 VERSION: 3.1.0
 DEFAULT: false
 --DESCRIPTION--
+<p>
+  <strong>Warning:</strong> Deprecated in favor of %HTML.SafeObject and
+  %Output.FlashCompat (turn both on to allow YouTube videos and other
+  Flash content).
+</p>
 <p>
   This directive enables YouTube video embedding in HTML Purifier. Check
   <a href="http://htmlpurifier.org/docs/enduser-youtube.html">this document
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt
similarity index 54%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt
index 3e231d2d..0b2c106d 100644
--- a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt
+++ b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt
@@ -5,11 +5,14 @@ DEFAULT: NULL
 --DESCRIPTION--
 
 <p>
-    This is a convenience directive that rolls the functionality of
-    %HTML.AllowedElements and %HTML.AllowedAttributes into one directive.
+    This is a preferred convenience directive that combines
+    %HTML.AllowedElements and %HTML.AllowedAttributes.
     Specify elements and attributes that are allowed using:
-    <code>element1[attr1|attr2],element2...</code>. You can also use
-    newlines instead of commas to separate elements.
+    <code>element1[attr1|attr2],element2...</code>.  For example,
+    if you would like to only allow paragraphs and links, specify
+    <code>a[href],p</code>.  You can specify attributes that apply
+    to all elements using an asterisk, e.g. <code>*[lang]</code>.
+    You can also use newlines instead of commas to separate elements.
 </p>
 <p>
     <strong>Warning</strong>:
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt
diff --git a/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt
new file mode 100644
index 00000000..1d3fa790
--- /dev/null
+++ b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt
@@ -0,0 +1,23 @@
+HTML.AllowedElements
+TYPE: lookup/null
+VERSION: 1.3.0
+DEFAULT: NULL
+--DESCRIPTION--
+<p>
+    If HTML Purifier's tag set is unsatisfactory for your needs, you can
+    overload it with your own list of tags to allow.  If you change
+    this, you probably also want to change %HTML.AllowedAttributes; see
+    also %HTML.Allowed which lets you set allowed elements and
+    attributes at the same time.
+</p>
+<p>
+    If you attempt to allow an element that HTML Purifier does not know
+    about, HTML Purifier will raise an error.  You will need to manually
+    tell HTML Purifier about this element by using the
+    <a href="http://htmlpurifier.org/docs/enduser-customize.html">advanced customization features.</a>
+</p>
+<p>
+    <strong>Warning:</strong> If another directive conflicts with the
+    elements here, <em>that</em> directive will win and override.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Attr.Name.UseCDATA.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Attr.Name.UseCDATA.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Attr.Name.UseCDATA.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Attr.Name.UseCDATA.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt
diff --git a/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.FlashAllowFullScreen.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.FlashAllowFullScreen.txt
new file mode 100644
index 00000000..7878dc0b
--- /dev/null
+++ b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.FlashAllowFullScreen.txt
@@ -0,0 +1,11 @@
+HTML.FlashAllowFullScreen
+TYPE: bool
+VERSION: 4.2.0
+DEFAULT: false
+--DESCRIPTION--
+<p>
+    Whether or not to permit embedded Flash content from
+    %HTML.SafeObject to expand to the full screen.  Corresponds to
+    the <code>allowFullScreen</code> parameter.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenAttributes.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenAttributes.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenAttributes.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenAttributes.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenElements.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenElements.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenElements.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenElements.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt
similarity index 65%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt
index f635a685..cdda09a4 100644
--- a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt
+++ b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt
@@ -7,8 +7,7 @@ DEFAULT: false
     Whether or not to permit embed tags in documents, with a number of extra
     security features added to prevent script execution. This is similar to
     what websites like MySpace do to embed tags. Embed is a proprietary
-    element and will cause your website to stop validating. You probably want
-    to enable this with %HTML.SafeObject.
-    <strong>Highly experimental.</strong>
-</p>
+    element and will cause your website to stop validating; you should
+    see if you can use %Output.FlashCompat with %HTML.SafeObject instead
+    first.</p>
 --# vim: et sw=4 sts=4
diff --git a/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt
new file mode 100644
index 00000000..ceb342e2
--- /dev/null
+++ b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt
@@ -0,0 +1,13 @@
+HTML.SafeObject
+TYPE: bool
+VERSION: 3.1.1
+DEFAULT: false
+--DESCRIPTION--
+<p>
+    Whether or not to permit object tags in documents, with a number of extra
+    security features added to prevent script execution. This is similar to
+    what websites like MySpace do to object tags.  You should also enable
+    %Output.FlashCompat in order to generate Internet Explorer
+    compatibility code for your object tags.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt
diff --git a/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.FlashCompat.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.FlashCompat.txt
new file mode 100644
index 00000000..93398e85
--- /dev/null
+++ b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.FlashCompat.txt
@@ -0,0 +1,11 @@
+Output.FlashCompat
+TYPE: bool
+VERSION: 4.1.0
+DEFAULT: false
+--DESCRIPTION--
+<p>
+  If true, HTML Purifier will generate Internet Explorer compatibility
+  code for all object code.  This is highly recommended if you enable
+  %HTML.SafeObject.
+</p>
+--# vim: et sw=4 sts=4
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.SortAttr.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.SortAttr.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.SortAttr.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.SortAttr.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt
similarity index 74%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt
index 98fdfe92..666635a5 100644
--- a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt
+++ b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt
@@ -12,4 +12,6 @@ array (
 --DESCRIPTION--
 Whitelist that defines the schemes that a URI is allowed to have.  This
 prevents XSS attacks from using pseudo-schemes like javascript or mocha.
+There is also support for the <code>data</code> and <code>file</code>
+URI schemes, but they are not enabled by default.
 --# vim: et sw=4 sts=4
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.Base.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.Base.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.Base.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.Base.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt
similarity index 64%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt
index 51e6ea91..f891de49 100644
--- a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt
+++ b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt
@@ -1,12 +1,15 @@
 URI.DisableResources
 TYPE: bool
-VERSION: 1.3.0
+VERSION: 4.2.0
 DEFAULT: false
 --DESCRIPTION--
-
 <p>
     Disables embedding resources, essentially meaning no pictures. You can
     still link to them though. See %URI.DisableExternalResources for why
     this might be a good idea.
 </p>
+<p>
+    <em>Note:</em> While this directive has been available since 1.3.0,
+    it didn't actually start doing anything until 4.2.0.
+</p>
 --# vim: et sw=4 sts=4
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.Host.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.Host.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.Host.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.Host.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.MungeResources.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.MungeResources.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.MungeResources.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.MungeResources.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/info.ini b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/info.ini
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/info.ini
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ConfigSchema/schema/info.ini
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ContentSets.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ContentSets.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ContentSets.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ContentSets.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Context.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Context.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Context.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Context.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Definition.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Definition.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Definition.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Definition.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/DefinitionCache.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/DefinitionCache.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/DefinitionCache.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/DefinitionCache.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/DefinitionCache/Decorator.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/DefinitionCache/Decorator.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/DefinitionCache/Decorator.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/DefinitionCache/Decorator.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/DefinitionCache/Decorator/Memory.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/DefinitionCache/Decorator/Memory.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/DefinitionCache/Decorator/Memory.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/DefinitionCache/Decorator/Memory.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/DefinitionCache/Decorator/Template.php.in b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/DefinitionCache/Decorator/Template.php.in
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/DefinitionCache/Decorator/Template.php.in
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/DefinitionCache/Decorator/Template.php.in
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/DefinitionCache/Null.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/DefinitionCache/Null.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/DefinitionCache/Null.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/DefinitionCache/Null.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/DefinitionCache/Serializer.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/DefinitionCache/Serializer.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/DefinitionCache/Serializer.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/DefinitionCache/Serializer.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/DefinitionCache/Serializer/README b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/DefinitionCache/Serializer/README
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/DefinitionCache/Serializer/README
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/DefinitionCache/Serializer/README
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/DefinitionCacheFactory.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/DefinitionCacheFactory.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/DefinitionCacheFactory.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/DefinitionCacheFactory.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Doctype.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Doctype.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Doctype.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Doctype.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/DoctypeRegistry.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/DoctypeRegistry.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/DoctypeRegistry.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/DoctypeRegistry.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ElementDef.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ElementDef.php
similarity index 96%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ElementDef.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ElementDef.php
index c4f5df97..cbd4e345 100644
--- a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ElementDef.php
+++ b/3.1/modules/purifier/vendor/HTMLPurifier/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.
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Encoder.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Encoder.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Encoder.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Encoder.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/EntityLookup.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/EntityLookup.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/EntityLookup.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/EntityLookup.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/EntityLookup/entities.ser b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/EntityLookup/entities.ser
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/EntityLookup/entities.ser
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/EntityLookup/entities.ser
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/EntityParser.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/EntityParser.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/EntityParser.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/EntityParser.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ErrorCollector.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ErrorCollector.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ErrorCollector.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ErrorCollector.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ErrorStruct.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ErrorStruct.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/ErrorStruct.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/ErrorStruct.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Exception.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Exception.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Exception.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Exception.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Filter.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Filter.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Filter.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Filter.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Filter/ExtractStyleBlocks.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Filter/ExtractStyleBlocks.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Filter/ExtractStyleBlocks.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Filter/ExtractStyleBlocks.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Filter/YouTube.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Filter/YouTube.php
similarity index 74%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Filter/YouTube.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Filter/YouTube.php
index aa3c17a0..9a9d9f96 100644
--- a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Filter/YouTube.php
+++ b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Filter/YouTube.php
@@ -7,13 +7,13 @@ class HTMLPurifier_Filter_YouTube extends HTMLPurifier_Filter
 
     public function preFilter($html, $config, $context) {
         $pre_regex = '#<object[^>]+>.+?'.
-            'http://www.youtube.com/v/([A-Za-z0-9\-_]+).+?</object>#s';
+            'http://www.youtube.com/((?:v|cp)/[A-Za-z0-9\-_=]+).+?</object>#s';
         $pre_replace = '<span class="youtube-embed">\1</span>';
         return preg_replace($pre_regex, $pre_replace, $html);
     }
 
     public function postFilter($html, $config, $context) {
-        $post_regex = '#<span class="youtube-embed">([A-Za-z0-9\-_]+)</span>#';
+        $post_regex = '#<span class="youtube-embed">((?:v|cp)/[A-Za-z0-9\-_=]+)</span>#';
         return preg_replace_callback($post_regex, array($this, 'postFilterCallback'), $html);
     }
 
@@ -24,10 +24,10 @@ class HTMLPurifier_Filter_YouTube extends HTMLPurifier_Filter
     protected function postFilterCallback($matches) {
         $url = $this->armorUrl($matches[1]);
         return '<object width="425" height="350" type="application/x-shockwave-flash" '.
-            'data="http://www.youtube.com/v/'.$url.'">'.
-            '<param name="movie" value="http://www.youtube.com/v/'.$url.'"></param>'.
+            'data="http://www.youtube.com/'.$url.'">'.
+            '<param name="movie" value="http://www.youtube.com/'.$url.'"></param>'.
             '<!--[if IE]>'.
-            '<embed src="http://www.youtube.com/v/'.$url.'"'.
+            '<embed src="http://www.youtube.com/'.$url.'"'.
             'type="application/x-shockwave-flash"'.
             'wmode="transparent" width="425" height="350" />'.
             '<![endif]-->'.
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Generator.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Generator.php
similarity index 73%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Generator.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Generator.php
index 22e841c1..e5988b64 100644
--- a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Generator.php
+++ b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Generator.php
@@ -31,6 +31,17 @@ class HTMLPurifier_Generator
      */
     private $_sortAttr;
 
+    /**
+     * Cache of %Output.FlashCompat
+     */
+    private $_flashCompat;
+
+    /**
+     * Stack for keeping track of object information when outputting IE
+     * compatibility code.
+     */
+    private $_flashStack = array();
+
     /**
      * Configuration for the generator
      */
@@ -44,6 +55,7 @@ class HTMLPurifier_Generator
         $this->config = $config;
         $this->_scriptFix = $config->get('Output.CommentScriptContents');
         $this->_sortAttr = $config->get('Output.SortAttr');
+        $this->_flashCompat = $config->get('Output.FlashCompat');
         $this->_def = $config->getHTMLDefinition();
         $this->_xhtml = $this->_def->doctype->xml;
     }
@@ -86,9 +98,11 @@ class HTMLPurifier_Generator
         }
 
         // Normalize newlines to system defined value
-        $nl = $this->config->get('Output.Newline');
-        if ($nl === null) $nl = PHP_EOL;
-        if ($nl !== "\n") $html = str_replace("\n", $nl, $html);
+        if ($this->config->get('Core.NormalizeNewlines')) {
+            $nl = $this->config->get('Output.Newline');
+            if ($nl === null) $nl = PHP_EOL;
+            if ($nl !== "\n") $html = str_replace("\n", $nl, $html);
+        }
         return $html;
     }
 
@@ -104,12 +118,41 @@ class HTMLPurifier_Generator
 
         } elseif ($token instanceof HTMLPurifier_Token_Start) {
             $attr = $this->generateAttributes($token->attr, $token->name);
+            if ($this->_flashCompat) {
+                if ($token->name == "object") {
+                    $flash = new stdclass();
+                    $flash->attr = $token->attr;
+                    $flash->param = array();
+                    $this->_flashStack[] = $flash;
+                }
+            }
             return '<' . $token->name . ($attr ? ' ' : '') . $attr . '>';
 
         } elseif ($token instanceof HTMLPurifier_Token_End) {
-            return '</' . $token->name . '>';
+            $_extra = '';
+            if ($this->_flashCompat) {
+                if ($token->name == "object" && !empty($this->_flashStack)) {
+                    $flash = array_pop($this->_flashStack);
+                    $compat_token = new HTMLPurifier_Token_Empty("embed");
+                    foreach ($flash->attr as $name => $val) {
+                        if ($name == "classid") continue;
+                        if ($name == "type") continue;
+                        if ($name == "data") $name = "src";
+                        $compat_token->attr[$name] = $val;
+                    }
+                    foreach ($flash->param as $name => $val) {
+                        if ($name == "movie") $name = "src";
+                        $compat_token->attr[$name] = $val;
+                    }
+                    $_extra = "<!--[if IE]>".$this->generateFromToken($compat_token)."<![endif]-->";
+                }
+            }
+            return $_extra . '</' . $token->name . '>';
 
         } elseif ($token instanceof HTMLPurifier_Token_Empty) {
+            if ($this->_flashCompat && $token->name == "param" && !empty($this->_flashStack)) {
+                $this->_flashStack[count($this->_flashStack)-1]->param[$token->attr['name']] = $token->attr['value'];
+            }
             $attr = $this->generateAttributes($token->attr, $token->name);
              return '<' . $token->name . ($attr ? ' ' : '') . $attr .
                 ( $this->_xhtml ? ' /': '' ) // <br /> v. <br>
@@ -174,7 +217,10 @@ class HTMLPurifier_Generator
      *               permissible for non-attribute output.
      * @return String escaped data.
      */
-    public function escape($string, $quote = ENT_COMPAT) {
+    public function escape($string, $quote = null) {
+        // Workaround for APC bug on Mac Leopard reported by sidepodcast
+        // http://htmlpurifier.org/phorum/read.php?3,4823,4846
+        if ($quote === null) $quote = ENT_COMPAT;
         return htmlspecialchars($string, $quote, 'UTF-8');
     }
 
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLDefinition.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLDefinition.php
similarity index 97%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLDefinition.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLDefinition.php
index 0195ce4c..f775604a 100644
--- a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLDefinition.php
+++ b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLDefinition.php
@@ -300,7 +300,12 @@ class HTMLPurifier_HTMLDefinition extends HTMLPurifier_Definition
                             unset($allowed_attributes_mutable[$key]);
                         }
                     }
-                    if ($delete) unset($this->info[$tag]->attr[$attr]);
+                    if ($delete) {
+                        if ($this->info[$tag]->attr[$attr]->required) {
+                            trigger_error("Required attribute '$attr' in element '$tag' was not allowed, which means '$tag' will not be allowed either", E_USER_WARNING);
+                        }
+                        unset($this->info[$tag]->attr[$attr]);
+                    }
                 }
             }
             // emit errors
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Bdo.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Bdo.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Bdo.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Bdo.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/CommonAttributes.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/CommonAttributes.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/CommonAttributes.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/CommonAttributes.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Edit.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Edit.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Edit.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Edit.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Forms.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Forms.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Forms.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Forms.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Hypertext.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Hypertext.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Hypertext.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Hypertext.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Image.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Image.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Image.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Image.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Legacy.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Legacy.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Legacy.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Legacy.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/List.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/List.php
similarity index 85%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/List.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/List.php
index db2d5324..2911a69b 100644
--- a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/List.php
+++ b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/List.php
@@ -20,8 +20,10 @@ class HTMLPurifier_HTMLModule_List extends HTMLPurifier_HTMLModule
     public $content_sets = array('Flow' => 'List');
 
     public function setup($config) {
-        $this->addElement('ol', 'List', 'Required: li', 'Common');
-        $this->addElement('ul', 'List', 'Required: li', 'Common');
+        $ol = $this->addElement('ol', 'List', 'Required: li', 'Common');
+        $ol->wrap = "li";
+        $ul = $this->addElement('ul', 'List', 'Required: li', 'Common');
+        $ul->wrap = "li";
         $this->addElement('dl', 'List', 'Required: dt | dd', 'Common');
 
         $this->addElement('li', false, 'Flow', 'Common');
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Name.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Name.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Name.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Name.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Object.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Object.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Object.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Object.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Presentation.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Presentation.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Presentation.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Presentation.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Proprietary.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Proprietary.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Proprietary.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Proprietary.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Ruby.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Ruby.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Ruby.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Ruby.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/SafeEmbed.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/SafeEmbed.php
similarity index 96%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/SafeEmbed.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/SafeEmbed.php
index 1fd57145..7f602317 100644
--- a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/SafeEmbed.php
+++ b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/SafeEmbed.php
@@ -20,6 +20,7 @@ class HTMLPurifier_HTMLModule_SafeEmbed extends HTMLPurifier_HTMLModule
                 'height' => 'Pixels#' . $max,
                 'allowscriptaccess' => 'Enum#never',
                 'allownetworking' => 'Enum#internal',
+                'flashvars' => 'Text',
                 'wmode' => 'Enum#window',
                 'name' => 'ID',
             )
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/SafeObject.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/SafeObject.php
similarity index 83%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/SafeObject.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/SafeObject.php
index 4378d2c6..d3de4f47 100644
--- a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/SafeObject.php
+++ b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/SafeObject.php
@@ -28,7 +28,10 @@ class HTMLPurifier_HTMLModule_SafeObject extends HTMLPurifier_HTMLModule
                 'type'   => 'Enum#application/x-shockwave-flash',
                 'width'  => 'Pixels#' . $max,
                 'height' => 'Pixels#' . $max,
-                'data'   => 'URI#embedded'
+                'data'   => 'URI#embedded',
+                'classid' => 'Enum#clsid:d27cdb6e-ae6d-11cf-96b8-444553540000',
+                'codebase' => new HTMLPurifier_AttrDef_Enum(array(
+                    'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0')),
             )
         );
         $object->attr_transform_post[] = new HTMLPurifier_AttrTransform_SafeObject();
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Scripting.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Scripting.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Scripting.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Scripting.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/StyleAttribute.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/StyleAttribute.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/StyleAttribute.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/StyleAttribute.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Tables.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Tables.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Tables.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Tables.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Target.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Target.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Target.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Target.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Text.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Text.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Text.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Text.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Name.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Name.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Name.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Name.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Proprietary.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Proprietary.php
similarity index 91%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Proprietary.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Proprietary.php
index f6aa6b03..d043aa72 100644
--- a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Proprietary.php
+++ b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Proprietary.php
@@ -15,6 +15,7 @@ class HTMLPurifier_HTMLModule_Tidy_Proprietary extends HTMLPurifier_HTMLModule_T
         $r['thead@background'] = new HTMLPurifier_AttrTransform_Background();
         $r['tfoot@background'] = new HTMLPurifier_AttrTransform_Background();
         $r['tbody@background'] = new HTMLPurifier_AttrTransform_Background();
+        $r['table@height']     = new HTMLPurifier_AttrTransform_Length('height');
         return $r;
     }
 
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Strict.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Strict.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Strict.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Strict.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Transitional.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Transitional.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Transitional.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/Transitional.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/XHTML.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/XHTML.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/XHTML.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/XHTML.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/XMLCommonAttributes.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/XMLCommonAttributes.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModule/XMLCommonAttributes.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModule/XMLCommonAttributes.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModuleManager.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModuleManager.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/HTMLModuleManager.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/HTMLModuleManager.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/IDAccumulator.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/IDAccumulator.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/IDAccumulator.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/IDAccumulator.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Injector.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Injector.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Injector.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Injector.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Injector/AutoParagraph.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Injector/AutoParagraph.php
similarity index 95%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Injector/AutoParagraph.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Injector/AutoParagraph.php
index c5444dbe..72152d81 100644
--- a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Injector/AutoParagraph.php
+++ b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Injector/AutoParagraph.php
@@ -34,16 +34,21 @@ class HTMLPurifier_Injector_AutoParagraph extends HTMLPurifier_Injector
                     //               ----
                     // This is a degenerate case
                 } else {
-                    // State 1.2: PAR1
-                    //            ----
+                    if (!$token->is_whitespace || $this->_isInline($current)) {
+                        // State 1.2: PAR1
+                        //            ----
 
-                    // State 1.3: PAR1\n\nPAR2
-                    //            ------------
+                        // State 1.3: PAR1\n\nPAR2
+                        //            ------------
 
-                    // State 1.4: <div>PAR1\n\nPAR2 (see State 2)
-                    //                 ------------
-                    $token = array($this->_pStart());
-                    $this->_splitText($text, $token);
+                        // State 1.4: <div>PAR1\n\nPAR2 (see State 2)
+                        //                 ------------
+                        $token = array($this->_pStart());
+                        $this->_splitText($text, $token);
+                    } else {
+                        // State 1.5: \n<hr />
+                        //            --
+                    }
                 }
             } else {
                 // State 2:   <div>PAR1... (similar to 1.4)
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Injector/DisplayLinkURI.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Injector/DisplayLinkURI.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Injector/DisplayLinkURI.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Injector/DisplayLinkURI.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Injector/Linkify.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Injector/Linkify.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Injector/Linkify.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Injector/Linkify.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Injector/PurifierLinkify.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Injector/PurifierLinkify.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Injector/PurifierLinkify.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Injector/PurifierLinkify.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Injector/RemoveEmpty.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Injector/RemoveEmpty.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Injector/RemoveEmpty.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Injector/RemoveEmpty.php
diff --git a/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php
new file mode 100644
index 00000000..509d5dc7
--- /dev/null
+++ b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php
@@ -0,0 +1,60 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+
+/**
+ * Injector that removes spans with no attributes
+ */
+class HTMLPurifier_Injector_RemoveSpansWithoutAttributes extends HTMLPurifier_Injector
+{
+    public $name = 'RemoveSpansWithoutAttributes';
+    public $needed = array('span');
+
+    private $attrValidator;
+
+    /**
+     * Used by AttrValidator
+     */
+    private $config;
+    private $context;
+
+    public function prepare($config, $context) {
+        $this->attrValidator = new HTMLPurifier_AttrValidator();
+        $this->config = $config;
+        $this->context = $context;
+        return parent::prepare($config, $context);
+    }
+
+    public function handleElement(&$token) {
+        if ($token->name !== 'span' || !$token instanceof HTMLPurifier_Token_Start) {
+            return;
+        }
+
+        // We need to validate the attributes now since this doesn't normally
+        // happen until after MakeWellFormed. If all the attributes are removed
+        // the span needs to be removed too.
+        $this->attrValidator->validateToken($token, $this->config, $this->context);
+        $token->armor['ValidateAttributes'] = true;
+
+        if (!empty($token->attr)) {
+            return;
+        }
+
+        $nesting = 0;
+        $spanContentTokens = array();
+        while ($this->forwardUntilEndToken($i, $current, $nesting)) {}
+
+        if ($current instanceof HTMLPurifier_Token_End && $current->name === 'span') {
+            // Mark closing span tag for deletion
+            $current->markForDeletion = true;
+            // Delete open span tag
+            $token = false;
+        }
+    }
+
+    public function handleEnd(&$token) {
+        if ($token->markForDeletion) {
+            $token = false;
+        }
+    }
+}
+
+// vim: et sw=4 sts=4
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Injector/SafeObject.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Injector/SafeObject.php
similarity index 93%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Injector/SafeObject.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Injector/SafeObject.php
index 42d8fd40..fc01eebc 100644
--- a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Injector/SafeObject.php
+++ b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Injector/SafeObject.php
@@ -20,6 +20,9 @@ class HTMLPurifier_Injector_SafeObject extends HTMLPurifier_Injector
     protected $allowedParam = array(
         'wmode' => true,
         'movie' => true,
+        'flashvars' => true,
+        'src' => true,
+        'allowFullScreen' => true, // if omitted, assume to be 'false'
     );
 
     public function prepare($config, $context) {
@@ -47,7 +50,8 @@ class HTMLPurifier_Injector_SafeObject extends HTMLPurifier_Injector
                 // We need this fix because YouTube doesn't supply a data
                 // attribute, which we need if a type is specified. This is
                 // *very* Flash specific.
-                if (!isset($this->objectStack[$i]->attr['data']) && $token->attr['name'] == 'movie') {
+                if (!isset($this->objectStack[$i]->attr['data']) &&
+                    ($token->attr['name'] == 'movie' || $token->attr['name'] == 'src')) {
                     $this->objectStack[$i]->attr['data'] = $token->attr['value'];
                 }
                 // Check if the parameter is the correct value but has not
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Language.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Language.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Language.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Language.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Language/classes/en-x-test.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Language/classes/en-x-test.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Language/classes/en-x-test.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Language/classes/en-x-test.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Language/messages/en-x-test.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Language/messages/en-x-test.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Language/messages/en-x-test.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Language/messages/en-x-test.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Language/messages/en-x-testmini.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Language/messages/en-x-testmini.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Language/messages/en-x-testmini.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Language/messages/en-x-testmini.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Language/messages/en.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Language/messages/en.php
similarity index 98%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Language/messages/en.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Language/messages/en.php
index 5377e5a3..2c96e307 100644
--- a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Language/messages/en.php
+++ b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Language/messages/en.php
@@ -23,6 +23,7 @@ $messages = array(
 'Lexer: Missing gt'            => 'Missing greater-than sign (>), previous less-than sign (<) should be escaped',
 'Lexer: Missing attribute key' => 'Attribute declaration has no key',
 'Lexer: Missing end quote'     => 'Attribute declaration has no end quote',
+'Lexer: Extracted body'        => 'Removed document metadata tags',
 
 'Strategy_RemoveForeignElements: Tag transform'              => '<$1> element transformed into $CurrentToken.Serialized',
 'Strategy_RemoveForeignElements: Missing required attribute' => '$CurrentToken.Compact element missing required attribute $1',
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/LanguageFactory.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/LanguageFactory.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/LanguageFactory.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/LanguageFactory.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Length.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Length.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Length.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Length.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Lexer.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Lexer.php
similarity index 90%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Lexer.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Lexer.php
index 9f20a412..6d6f4864 100644
--- a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Lexer.php
+++ b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Lexer.php
@@ -230,6 +230,17 @@ class HTMLPurifier_Lexer
         );
     }
 
+    /**
+     * Special Internet Explorer conditional comments should be removed.
+     */
+    protected static function removeIEConditional($string) {
+        return preg_replace(
+            '#<!--\[if [^>]+\]>.*<!\[endif\]-->#si', // probably should generalize for all strings
+            '',
+            $string
+        );
+    }
+
     /**
      * Callback function for escapeCDATA() that does the work.
      *
@@ -252,20 +263,32 @@ class HTMLPurifier_Lexer
     public function normalize($html, $config, $context) {
 
         // normalize newlines to \n
-        $html = str_replace("\r\n", "\n", $html);
-        $html = str_replace("\r", "\n", $html);
+        if ($config->get('Core.NormalizeNewlines')) {
+            $html = str_replace("\r\n", "\n", $html);
+            $html = str_replace("\r", "\n", $html);
+        }
 
         if ($config->get('HTML.Trusted')) {
             // escape convoluted CDATA
             $html = $this->escapeCommentedCDATA($html);
         }
 
+        $html = $this->removeIEConditional($html);
+
         // escape CDATA
         $html = $this->escapeCDATA($html);
 
         // extract body from document if applicable
         if ($config->get('Core.ConvertDocumentToFragment')) {
-            $html = $this->extractBody($html);
+            $e = false;
+            if ($config->get('Core.CollectErrors')) {
+                $e =& $context->get('ErrorCollector');
+            }
+            $new_html = $this->extractBody($html);
+            if ($e && $new_html != $html) {
+                $e->send(E_WARNING, 'Lexer: Extracted body');
+            }
+            $html = $new_html;
         }
 
         // expand entities that aren't the big five
@@ -276,6 +299,11 @@ class HTMLPurifier_Lexer
         // represent non-SGML characters (horror, horror!)
         $html = HTMLPurifier_Encoder::cleanUTF8($html);
 
+        // if processing instructions are to removed, remove them now
+        if ($config->get('Core.RemoveProcessingInstructions')) {
+            $html = preg_replace('#<\?.+?\?>#s', '', $html);
+        }
+
         return $html;
     }
 
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Lexer/DOMLex.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Lexer/DOMLex.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Lexer/DOMLex.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Lexer/DOMLex.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Lexer/DirectLex.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Lexer/DirectLex.php
similarity index 99%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Lexer/DirectLex.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Lexer/DirectLex.php
index eb421b23..b7d9abfa 100644
--- a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Lexer/DirectLex.php
+++ b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Lexer/DirectLex.php
@@ -384,7 +384,7 @@ class HTMLPurifier_Lexer_DirectLex extends HTMLPurifier_Lexer
                 }
             }
             if ($value === false) $value = '';
-            return array($key => $value);
+            return array($key => $this->parseData($value));
         }
 
         // setup loop environment
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Lexer/PEARSax3.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Lexer/PEARSax3.php
similarity index 69%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Lexer/PEARSax3.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Lexer/PEARSax3.php
index 57173455..72c87635 100644
--- a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Lexer/PEARSax3.php
+++ b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Lexer/PEARSax3.php
@@ -26,13 +26,20 @@ class HTMLPurifier_Lexer_PEARSax3 extends HTMLPurifier_Lexer
      * Internal accumulator array for SAX parsers.
      */
     protected $tokens = array();
+    protected $last_token_was_empty;
+
+    private $parent_handler;
+    private $stack = array();
 
     public function tokenizeHTML($string, $config, $context) {
 
         $this->tokens = array();
+        $this->last_token_was_empty = false;
 
         $string = $this->normalize($string, $config, $context);
 
+        $this->parent_handler = set_error_handler(array($this, 'muteStrictErrorHandler'));
+
         $parser = new XML_HTMLSax3();
         $parser->set_object($this);
         $parser->set_element_handler('openHandler','closeHandler');
@@ -44,6 +51,8 @@ class HTMLPurifier_Lexer_PEARSax3 extends HTMLPurifier_Lexer
 
         $parser->parse($string);
 
+        restore_error_handler();
+
         return $this->tokens;
 
     }
@@ -58,9 +67,11 @@ class HTMLPurifier_Lexer_PEARSax3 extends HTMLPurifier_Lexer
         }
         if ($closed) {
             $this->tokens[] = new HTMLPurifier_Token_Empty($name, $attrs);
+            $this->last_token_was_empty = true;
         } else {
             $this->tokens[] = new HTMLPurifier_Token_Start($name, $attrs);
         }
+        $this->stack[] = $name;
         return true;
     }
 
@@ -71,10 +82,12 @@ class HTMLPurifier_Lexer_PEARSax3 extends HTMLPurifier_Lexer
         // HTMLSax3 seems to always send empty tags an extra close tag
         // check and ignore if you see it:
         // [TESTME] to make sure it doesn't overreach
-        if ($this->tokens[count($this->tokens)-1] instanceof HTMLPurifier_Token_Empty) {
+        if ($this->last_token_was_empty) {
+            $this->last_token_was_empty = false;
             return true;
         }
         $this->tokens[] = new HTMLPurifier_Token_End($name);
+        if (!empty($this->stack)) array_pop($this->stack);
         return true;
     }
 
@@ -82,6 +95,7 @@ class HTMLPurifier_Lexer_PEARSax3 extends HTMLPurifier_Lexer
      * Data event handler, interface is defined by PEAR package.
      */
     public function dataHandler(&$parser, $data) {
+        $this->last_token_was_empty = false;
         $this->tokens[] = new HTMLPurifier_Token_Text($data);
         return true;
     }
@@ -91,7 +105,18 @@ class HTMLPurifier_Lexer_PEARSax3 extends HTMLPurifier_Lexer
      */
     public function escapeHandler(&$parser, $data) {
         if (strpos($data, '--') === 0) {
-            $this->tokens[] = new HTMLPurifier_Token_Comment($data);
+            // remove trailing and leading double-dashes
+            $data = substr($data, 2);
+            if (strlen($data) >= 2 && substr($data, -2) == "--") {
+                $data = substr($data, 0, -2);
+            }
+            if (isset($this->stack[sizeof($this->stack) - 1]) &&
+                $this->stack[sizeof($this->stack) - 1] == "style") {
+                $this->tokens[] = new HTMLPurifier_Token_Text($data);
+            } else {
+                $this->tokens[] = new HTMLPurifier_Token_Comment($data);
+            }
+            $this->last_token_was_empty = false;
         }
         // CDATA is handled elsewhere, but if it was handled here:
         //if (strpos($data, '[CDATA[') === 0) {
@@ -101,6 +126,14 @@ class HTMLPurifier_Lexer_PEARSax3 extends HTMLPurifier_Lexer
         return true;
     }
 
+    /**
+     * An error handler that mutes strict errors
+     */
+    public function muteStrictErrorHandler($errno, $errstr, $errfile=null, $errline=null, $errcontext=null) {
+        if ($errno == E_STRICT) return;
+        return call_user_func($this->parent_handler, $errno, $errstr, $errfile, $errline, $errcontext);
+    }
+
 }
 
 // vim: et sw=4 sts=4
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Lexer/PH5P.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Lexer/PH5P.php
similarity index 99%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Lexer/PH5P.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Lexer/PH5P.php
index 0d20c0ce..b42965ef 100644
--- a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Lexer/PH5P.php
+++ b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Lexer/PH5P.php
@@ -125,8 +125,6 @@ class HTML5 {
     const EOF      = 5;
 
     public function __construct($data) {
-        $data = str_replace("\r\n", "\n", $data);
-        $data = str_replace("\r", null, $data);
 
         $this->data = $data;
         $this->char = -1;
@@ -3903,4 +3901,4 @@ class HTML5TreeConstructer {
         return $this->dom;
     }
 }
-
+?>
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/PercentEncoder.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/PercentEncoder.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/PercentEncoder.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/PercentEncoder.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Printer.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Printer.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Printer.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Printer.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Printer/CSSDefinition.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Printer/CSSDefinition.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Printer/CSSDefinition.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Printer/CSSDefinition.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Printer/ConfigForm.css b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Printer/ConfigForm.css
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Printer/ConfigForm.css
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Printer/ConfigForm.css
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Printer/ConfigForm.js b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Printer/ConfigForm.js
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Printer/ConfigForm.js
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Printer/ConfigForm.js
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Printer/ConfigForm.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Printer/ConfigForm.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Printer/ConfigForm.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Printer/ConfigForm.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Printer/HTMLDefinition.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Printer/HTMLDefinition.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Printer/HTMLDefinition.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Printer/HTMLDefinition.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/PropertyList.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/PropertyList.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/PropertyList.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/PropertyList.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/PropertyListIterator.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/PropertyListIterator.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/PropertyListIterator.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/PropertyListIterator.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Strategy.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Strategy.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Strategy.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Strategy.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Strategy/Composite.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Strategy/Composite.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Strategy/Composite.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Strategy/Composite.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Strategy/Core.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Strategy/Core.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Strategy/Core.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Strategy/Core.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Strategy/FixNesting.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Strategy/FixNesting.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Strategy/FixNesting.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Strategy/FixNesting.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Strategy/MakeWellFormed.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Strategy/MakeWellFormed.php
similarity index 94%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Strategy/MakeWellFormed.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Strategy/MakeWellFormed.php
index c81b6b7b..03c92bd4 100644
--- a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Strategy/MakeWellFormed.php
+++ b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Strategy/MakeWellFormed.php
@@ -83,6 +83,7 @@ class HTMLPurifier_Strategy_MakeWellFormed extends HTMLPurifier_Strategy
             $this->injectors[] = $injector;
         }
         foreach ($custom_injectors as $injector) {
+            if (!$injector) continue;
             if (is_string($injector)) {
                 $injector = "HTMLPurifier_Injector_$injector";
                 $injector = new $injector;
@@ -164,6 +165,7 @@ class HTMLPurifier_Strategy_MakeWellFormed extends HTMLPurifier_Strategy
             $token = $tokens[$t];
 
             //echo '<br>'; printTokens($tokens, $t); printTokens($this->stack);
+            //flush();
 
             // quick-check: if it's not a tag, no need to process
             if (empty($token->is_tag)) {
@@ -219,6 +221,22 @@ class HTMLPurifier_Strategy_MakeWellFormed extends HTMLPurifier_Strategy
                         $autoclose = false;
                     }
 
+                    if ($autoclose && $definition->info[$token->name]->wrap) {
+                        // Check if an element can be wrapped by another 
+                        // element to make it valid in a context (for 
+                        // example, <ul><ul> needs a <li> in between)
+                        $wrapname = $definition->info[$token->name]->wrap;
+                        $wrapdef = $definition->info[$wrapname];
+                        $elements = $wrapdef->child->getAllowedElements($config);
+                        $parent_elements = $definition->info[$parent->name]->child->getAllowedElements($config);
+                        if (isset($elements[$token->name]) && isset($parent_elements[$wrapname])) {
+                            $newtoken = new HTMLPurifier_Token_Start($wrapname);
+                            $this->insertBefore($newtoken);
+                            $reprocess = true;
+                            continue;
+                        }
+                    }
+
                     $carryover = false;
                     if ($autoclose && $definition->info[$parent->name]->formatting) {
                         $carryover = true;
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Strategy/RemoveForeignElements.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Strategy/RemoveForeignElements.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Strategy/RemoveForeignElements.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Strategy/RemoveForeignElements.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Strategy/ValidateAttributes.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Strategy/ValidateAttributes.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Strategy/ValidateAttributes.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Strategy/ValidateAttributes.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/StringHash.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/StringHash.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/StringHash.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/StringHash.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/StringHashParser.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/StringHashParser.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/StringHashParser.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/StringHashParser.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/TagTransform.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/TagTransform.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/TagTransform.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/TagTransform.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/TagTransform/Font.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/TagTransform/Font.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/TagTransform/Font.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/TagTransform/Font.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/TagTransform/Simple.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/TagTransform/Simple.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/TagTransform/Simple.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/TagTransform/Simple.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Token.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Token.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Token.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Token.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Token/Comment.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Token/Comment.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Token/Comment.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Token/Comment.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Token/Empty.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Token/Empty.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Token/Empty.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Token/Empty.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Token/End.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Token/End.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Token/End.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Token/End.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Token/Start.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Token/Start.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Token/Start.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Token/Start.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Token/Tag.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Token/Tag.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Token/Tag.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Token/Tag.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Token/Text.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Token/Text.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/Token/Text.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/Token/Text.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/TokenFactory.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/TokenFactory.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/TokenFactory.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/TokenFactory.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URI.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URI.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URI.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URI.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URIDefinition.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIDefinition.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URIDefinition.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIDefinition.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URIFilter.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIFilter.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URIFilter.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIFilter.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URIFilter/DisableExternal.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIFilter/DisableExternal.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URIFilter/DisableExternal.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIFilter/DisableExternal.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URIFilter/DisableExternalResources.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIFilter/DisableExternalResources.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URIFilter/DisableExternalResources.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIFilter/DisableExternalResources.php
diff --git a/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIFilter/DisableResources.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIFilter/DisableResources.php
new file mode 100644
index 00000000..e69d970a
--- /dev/null
+++ b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIFilter/DisableResources.php
@@ -0,0 +1,11 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+
+class HTMLPurifier_URIFilter_DisableResources extends HTMLPurifier_URIFilter
+{
+    public $name = 'DisableResources';
+    public function filter(&$uri, $config, $context) {
+        return !$context->get('EmbeddedURI', true);
+    }
+}
+
+// vim: et sw=4 sts=4
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URIFilter/HostBlacklist.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIFilter/HostBlacklist.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URIFilter/HostBlacklist.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIFilter/HostBlacklist.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URIFilter/MakeAbsolute.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIFilter/MakeAbsolute.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URIFilter/MakeAbsolute.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIFilter/MakeAbsolute.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URIFilter/Munge.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIFilter/Munge.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URIFilter/Munge.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIFilter/Munge.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URIParser.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIParser.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URIParser.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIParser.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URIScheme.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIScheme.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URIScheme.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIScheme.php
diff --git a/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIScheme/data.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIScheme/data.php
new file mode 100644
index 00000000..bc4fb8cd
--- /dev/null
+++ b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIScheme/data.php
@@ -0,0 +1,93 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+
+/**
+ * Implements data: URI for base64 encoded images supported by GD.
+ */
+class HTMLPurifier_URIScheme_data extends HTMLPurifier_URIScheme {
+
+    public $browsable = true;
+    public $allowed_types = array(
+        // you better write validation code for other types if you
+        // decide to allow them
+        'image/jpeg' => true,
+        'image/gif' => true,
+        'image/png' => true,
+        );
+
+    public function validate(&$uri, $config, $context) {
+        $result = explode(',', $uri->path, 2);
+        $is_base64 = false;
+        $charset = null;
+        $content_type = null;
+        if (count($result) == 2) {
+            list($metadata, $data) = $result;
+            // do some legwork on the metadata
+            $metas = explode(';', $metadata);
+            while(!empty($metas)) {
+                $cur = array_shift($metas);
+                if ($cur == 'base64') {
+                    $is_base64 = true;
+                    break;
+                }
+                if (substr($cur, 0, 8) == 'charset=') {
+                    // doesn't match if there are arbitrary spaces, but
+                    // whatever dude
+                    if ($charset !== null) continue; // garbage
+                    $charset = substr($cur, 8); // not used
+                } else {
+                    if ($content_type !== null) continue; // garbage
+                    $content_type = $cur;
+                }
+            }
+        } else {
+            $data = $result[0];
+        }
+        if ($content_type !== null && empty($this->allowed_types[$content_type])) {
+            return false;
+        }
+        if ($charset !== null) {
+            // error; we don't allow plaintext stuff
+            $charset = null;
+        }
+        $data = rawurldecode($data);
+        if ($is_base64) {
+            $raw_data = base64_decode($data);
+        } else {
+            $raw_data = $data;
+        }
+        // XXX probably want to refactor this into a general mechanism
+        // for filtering arbitrary content types
+        $file = tempnam("/tmp", "");
+        file_put_contents($file, $raw_data);
+        if (function_exists('exif_imagetype')) {
+            $image_code = exif_imagetype($file);
+        } elseif (function_exists('getimagesize')) {
+            set_error_handler(array($this, 'muteErrorHandler'));
+            $info = getimagesize($file);
+            restore_error_handler();
+            if ($info == false) return false;
+            $image_code = $info[2];
+        } else {
+            trigger_error("could not find exif_imagetype or getimagesize functions", E_USER_ERROR);
+        }
+        $real_content_type = image_type_to_mime_type($image_code);
+        if ($real_content_type != $content_type) {
+            // we're nice guys; if the content type is something else we
+            // support, change it over
+            if (empty($this->allowed_types[$real_content_type])) return false;
+            $content_type = $real_content_type;
+        }
+        // ok, it's kosher, rewrite what we need
+        $uri->userinfo = null;
+        $uri->host = null;
+        $uri->port = null;
+        $uri->fragment = null;
+        $uri->query = null;
+        $uri->path = "$content_type;base64," . base64_encode($raw_data);
+        return true;
+    }
+
+    public function muteErrorHandler($errno, $errstr) {}
+
+}
+
diff --git a/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIScheme/file.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIScheme/file.php
new file mode 100644
index 00000000..66c30232
--- /dev/null
+++ b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIScheme/file.php
@@ -0,0 +1,26 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+
+/**
+ * Validates file as defined by RFC 1630 and RFC 1738.
+ */
+class HTMLPurifier_URIScheme_file extends HTMLPurifier_URIScheme {
+
+    // Generally file:// URLs are not accessible from most
+    // machines, so placing them as an img src is incorrect.
+    public $browsable = false;
+
+    public function validate(&$uri, $config, $context) {
+        parent::validate($uri, $config, $context);
+        // Authentication method is not supported
+        $uri->userinfo = null;
+        // file:// makes no provisions for accessing the resource
+        $uri->port     = null;
+        // While it seems to work on Firefox, the querystring has
+        // no possible effect and is thus stripped.
+        $uri->query    = null;
+        return true;
+    }
+
+}
+
+// vim: et sw=4 sts=4
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URIScheme/ftp.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIScheme/ftp.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URIScheme/ftp.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIScheme/ftp.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URIScheme/http.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIScheme/http.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URIScheme/http.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIScheme/http.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URIScheme/https.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIScheme/https.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URIScheme/https.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIScheme/https.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URIScheme/mailto.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIScheme/mailto.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URIScheme/mailto.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIScheme/mailto.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URIScheme/news.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIScheme/news.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URIScheme/news.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIScheme/news.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URIScheme/nntp.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIScheme/nntp.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URIScheme/nntp.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URIScheme/nntp.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URISchemeRegistry.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URISchemeRegistry.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/URISchemeRegistry.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/URISchemeRegistry.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/UnitConverter.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/UnitConverter.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/UnitConverter.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/UnitConverter.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/VarParser.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/VarParser.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/VarParser.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/VarParser.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/VarParser/Flexible.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/VarParser/Flexible.php
similarity index 88%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/VarParser/Flexible.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/VarParser/Flexible.php
index e5998e5e..dea9f169 100644
--- a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/VarParser/Flexible.php
+++ b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/VarParser/Flexible.php
@@ -62,7 +62,7 @@ class HTMLPurifier_VarParser_Flexible extends HTMLPurifier_VarParser
                         foreach ($var as $keypair) {
                             $c = explode(':', $keypair, 2);
                             if (!isset($c[1])) continue;
-                            $nvar[$c[0]] = $c[1];
+                            $nvar[trim($c[0])] = trim($c[1]);
                         }
                         $var = $nvar;
                     }
@@ -79,8 +79,15 @@ class HTMLPurifier_VarParser_Flexible extends HTMLPurifier_VarParser
                         return $new;
                     } else break;
                 }
+                if ($type === self::ALIST) {
+                    trigger_error("Array list did not have consecutive integer indexes", E_USER_WARNING);
+                    return array_values($var);
+                }
                 if ($type === self::LOOKUP) {
                     foreach ($var as $key => $value) {
+                        if ($value !== true) {
+                            trigger_error("Lookup array has non-true value at key '$key'; maybe your input array was not indexed numerically", E_USER_WARNING);
+                        }
                         $var[$key] = true;
                     }
                 }
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/VarParser/Native.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/VarParser/Native.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/VarParser/Native.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/VarParser/Native.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/VarParserException.php b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/VarParserException.php
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifier/VarParserException.php
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifier/VarParserException.php
diff --git a/3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifierLicense b/3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifierLicense
similarity index 100%
rename from 3.1/modules/purifier/lib/HTMLPurifier/HTMLPurifierLicense
rename to 3.1/modules/purifier/vendor/HTMLPurifier/HTMLPurifierLicense

From 786a2fd2acb9de77f6e9b7b9db4e32aeb98212a5 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 8 Jan 2011 18:41:28 -0800
Subject: [PATCH 09/10] Bump purifier modules to v2 since we're using a newer
 version of HTMLPurifier

---
 3.0/modules/purifier/module.info | 2 +-
 3.1/modules/purifier/module.info | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/3.0/modules/purifier/module.info b/3.0/modules/purifier/module.info
index ef14f615..4819b4e5 100644
--- a/3.0/modules/purifier/module.info
+++ b/3.0/modules/purifier/module.info
@@ -1,3 +1,3 @@
 name = "HTML Purifier"
 description = "Enable XSS protection using HTMLPurifier"
-version = 1
+version = 2
diff --git a/3.1/modules/purifier/module.info b/3.1/modules/purifier/module.info
index ef14f615..4819b4e5 100644
--- a/3.1/modules/purifier/module.info
+++ b/3.1/modules/purifier/module.info
@@ -1,3 +1,3 @@
 name = "HTML Purifier"
 description = "Enable XSS protection using HTMLPurifier"
-version = 1
+version = 2

From d8fe4eeec5e80adb105a1d31c5a87c1f1417b9c7 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 9 Jan 2011 00:27:23 -0800
Subject: [PATCH 10/10] Add a README so that github has something to show

---
 README | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 README

diff --git a/README b/README
new file mode 100644
index 00000000..189117a1
--- /dev/null
+++ b/README
@@ -0,0 +1,15 @@
+Gallery3 Contrib
+
+These are unofficial modules, themes and utilities for Gallery 3
+created by the Gallery community.  Many of them add considerable value
+to your Gallery 3 install, but they come with no official support from
+the core Gallery team.
+
+To discuss anything you find here, please refer to the Gallery forums:
+
+  http://gallery.menalto.com/forum/96
+
+For an easy interface to download and install individual modules,
+please refer to:
+
+  http://gallerymodules.com