Bug #4299: Fix dimming signatures when mixed with quoted text

diff --git a/framework/Text_Filter/lib/Horde/Text/Filter/Dimsignature.php b/framework/Text_Filter/lib/Horde/Text/Filter/Dimsignature.php
index 07ee6c3..5833e9b 100644 (file)
--- a/framework/Text_Filter/lib/Horde/Text/Filter/Dimsignature.php
+++ b/framework/Text_Filter/lib/Horde/Text/Filter/Dimsignature.php
@@ -22,12 +22,14 @@ class Horde_Text_Filter_Dimsignature extends Horde_Text_Filter
      */
     public function postProcess($text)
     {
-        $parts = preg_split('|(\n--\s*(?:<br />)?\r?\n)|', $text, -1, PREG_SPLIT_DELIM_CAPTURE);
-        $num_parts = count($parts);
-        if ($num_parts > 2) {
-            return implode('', array_slice($parts, 0, -2))
-                . '<span class="signature">' . $parts[$num_parts - 2]
-                . $parts[$num_parts - 1] . '</span>';
+        $parts = preg_split('/(\n--\s*(?:<br \/>)?\r?\n.*?)(?=<\/?(?:div|span)|$\s)/is', $text, -1, PREG_SPLIT_DELIM_CAPTURE);
+        $text = '';
+
+        while (count($parts)) {
+            $text .= array_shift($parts);
+            if (count($parts)) {
+                $text .= '<span class="signature">' . array_shift($parts) . '</span>';
+            }
         }
 
         return $text;

diff --git a/framework/Text_Filter/package.xml b/framework/Text_Filter/package.xml
index 647f2f0..08d66dc 100644 (file)
--- a/framework/Text_Filter/package.xml
+++ b/framework/Text_Filter/package.xml
@@ -37,7 +37,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
   <api>beta</api>
  </stability>
  <license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
- <notes>* Added javscript minify filter.
+ <notes>* Fix dimming signatures when mixed with quoted text (Bug #4299).
+ * Added javscript minify filter.
  * Add support for using the tidy extension when filtering HTML data.
  * Initial Horde 4 package.
  </notes>