Changeset 6236838 in github

Timestamp:

May 12, 2012 5:30:00 AM (13 months ago)

Author:

Aleksander Machniak <alec@…>

Branches:

release-0.8

Children:

02cf44e

Parents:

8253e7d

git-author:

Aleksander Machniak <alec@…> (05/12/12 05:27:59)

git-committer:

Aleksander Machniak <alec@…> (05/12/12 05:30:00)

Message:

Fix handling of some HTML tags e.g. IMG (#1488471) - reworked fix for #1486812

Files:

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

CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Fix handling of some HTML tags e.g. IMG (#1488471)
 - Use similar language as a fallback for plugin localization (#1488401)
 - Fix issue where signature wasn't re-added on draft compose (#1488322)

program/lib/washtml.php

@@ -109 +109 @@
   /* Block elements which could be empty but cannot be returned in short form (<tag />) */
   static $block_elements = array('div', 'p', 'pre', 'blockquote', 'a', 'font', 'center',
-    'table', 'ul', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'ol', 'dl', 'strong', 'i', 'b', 'u');
+    'table', 'ul', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'ol', 'dl', 'strong', 'i', 'b', 'u', 'span');
 
   /* State for linked objects in HTML */
@@ -134 +134 @@
 
   /* Constructor */
-  public function __construct($p = array()) {
+  public function __construct($p = array())
+  {
     $this->_html_elements = array_flip((array)$p['html_elements']) + array_flip(self::$html_elements) ;
     $this->_html_attribs = array_flip((array)$p['html_attribs']) + array_flip(self::$html_attribs);
@@ -150 +151 @@
 
   /* Check CSS style */
-  private function wash_style($style) {
+  private function wash_style($style)
+  {
     $s = '';
 
@@ -192 +194 @@
 
   /* Take a node and return allowed attributes and check values */
-  private function wash_attribs($node) {
+  private function wash_attribs($node)
+  {
     $t = '';
     $washed;
@@ -232 +235 @@
    * It output only allowed tags with allowed attributes
    * and allowed inline styles */
-  private function dumpHtml($node) {
+  private function dumpHtml($node)
+  {
     if(!$node->hasChildNodes())
       return '';
@@ -249 +253 @@
           $content = $this->dumpHtml($node);
           $dump .= '<' . $tagName . $this->wash_attribs($node) .
-            // 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>" : ' />');
+            ($content != '' || isset($this->_block_elements[$tagName]) ? ">$content</$tagName>" : ' />');
         }
         else if (isset($this->_ignore_elements[$tagName])) {
@@ -311 +313 @@
 
 }
-
-?>