Changeset 3778 in subversion

Timestamp:

Jun 23, 2010 2:57:45 AM (3 years ago)

Author:

alec

Message:

• Improve parsing of styled empty tags in HTML messages (#1486812)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/lib/washtml.php (modified) (2 diffs)

trunk/roundcubemail/CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Improve parsing of styled empty tags in HTML messages (#1486812)
 - Add %dc variable support in base_dn/bind_dn config (#1486779)
 - Add button to hide/unhide the preview pane (#1484215)

trunk/roundcubemail/program/lib/washtml.php

@@ -90 +90 @@
 
   /* Block elements which could be empty but cannot be returned in short form (<tag />) */
-  static $block_elements = array('div', 'p', 'pre', 'blockquote', 'a', 'font');
+  static $block_elements = array('div', 'p', 'pre', 'blockquote', 'a', 'font', 'center', 'table', 'ul', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'ol', 'dl');
   
   /* State for linked objects in HTML */
@@ -227 +227 @@
           $content = $this->dumpHtml($node);
           $dump .= '<' . $tagName . $this->wash_attribs($node) .
-            ($content != '' || isset($this->_block_elements[$tagName]) ? ">$content</$tagName>" : ' />');
+            // create closing tag for block elements, but also for elements
+            // with content or with some attributes (eg. style, class) (#1486812)
+            ($content != '' || $node->hasAttributes() || isset($this->_block_elements[$tagName]) ? ">$content</$tagName>" : ' />');
         }
         else if (isset($this->_ignore_elements[$tagName])) {