From 4c3d197c77a79fb5fc689709d3f890eed6a29a15 Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Fri, 5 Nov 2010 13:10:00 -0600
Subject: [PATCH] Per mailing list discussion, dom extension needs to be marked
 as required for Horde_Util

---
 framework/Text_Filter/lib/Horde/Text/Filter/Xss.php | 7 ++-----
 framework/Text_Filter/package.xml                   | 3 ---
 framework/Util/package.xml                          | 6 +++---
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/framework/Text_Filter/lib/Horde/Text/Filter/Xss.php b/framework/Text_Filter/lib/Horde/Text/Filter/Xss.php
index 08d274843..101292cf5 100644
--- a/framework/Text_Filter/lib/Horde/Text/Filter/Xss.php
+++ b/framework/Text_Filter/lib/Horde/Text/Filter/Xss.php
@@ -96,14 +96,11 @@ class Horde_Text_Filter_Xss extends Horde_Text_Filter_Base
      *
      * @return string|Horde_Domhtml  The modified text or a Domhtml object if
      *                               the 'return_dom' parameter is set.
+     * @throws Exception
      */
     public function postProcess($text)
     {
-        try {
-            $dom = new Horde_Domhtml($text, $this->_params['charset']);
-        } catch (Exception $e) {
-            return $text;
-        }
+        $dom = new Horde_Domhtml($text, $this->_params['charset']);
 
         $this->_node($dom->dom, $dom->dom);
 
diff --git a/framework/Text_Filter/package.xml b/framework/Text_Filter/package.xml
index ac85d3db7..fb4eb759c 100644
--- a/framework/Text_Filter/package.xml
+++ b/framework/Text_Filter/package.xml
@@ -392,9 +392,6 @@
     <name>Text_Flowed</name>
     <channel>pear.horde.org</channel>
    </package>
-   <extension>
-    <name>dom</name>
-   </extension>
    <package>
     <name>Translation</name>
     <channel>pear.horde.org</channel>
diff --git a/framework/Util/package.xml b/framework/Util/package.xml
index 61a5aaf27..b062ecd30 100644
--- a/framework/Util/package.xml
+++ b/framework/Util/package.xml
@@ -79,6 +79,9 @@
     <name>Url</name>
     <channel>pear.horde.org</channel>
    </package>
+   <extension>
+    <name>dom</name>
+   </extension>
   </required>
   <optional>
    <package>
@@ -86,9 +89,6 @@
     <channel>pear.horde.org</channel>
    </package>
    <extension>
-    <name>dom</name>
-   </extension>
-   <extension>
     <name>iconv</name>
    </extension>
    <extension>
-- 
2.11.0