MDL-19183 imported HTMLpurifier 3.3.0

lib/htmlpurifier/HTMLPurifier/ChildDef/Table.php

@@ -12,31 +12,31 @@ class HTMLPurifier_ChildDef_Table extends HTMLPurifier_ChildDef
     public function __construct() {}
     public function validateChildren($tokens_of_children, $config, $context) {
         if (empty($tokens_of_children)) return false;
-        
+
         // this ensures that the loop gets run one last time before closing
         // up. It's a little bit of a hack, but it works! Just make sure you
         // get rid of the token later.
         $tokens_of_children[] = false;
-        
+
         // only one of these elements is allowed in a table
         $caption = false;
         $thead   = false;
         $tfoot   = false;
-        
+
         // as many of these as you want
         $cols    = array();
         $content = array();
-        
+
         $nesting = 0; // current depth so we can determine nodes
         $is_collecting = false; // are we globbing together tokens to package
                                 // into one of the collectors?
         $collection = array(); // collected nodes
         $tag_index = 0; // the first node might be whitespace,
                             // so this tells us where the start tag is
-        
+
         foreach ($tokens_of_children as $token) {
             $is_child = ($nesting == 0);
-            
+
             if ($token === false) {
                 // terminating sequence started
             } elseif ($token instanceof HTMLPurifier_Token_Start) {
@@ -44,7 +44,7 @@ class HTMLPurifier_ChildDef_Table extends HTMLPurifier_ChildDef
             } elseif ($token instanceof HTMLPurifier_Token_End) {
                 $nesting--;
             }
-            
+
             // handle node collection
             if ($is_collecting) {
                 if ($is_child) {
@@ -85,10 +85,10 @@ class HTMLPurifier_ChildDef_Table extends HTMLPurifier_ChildDef
                     $collection[] = $token;
                 }
             }
-            
+
             // terminate
             if ($token === false) break;
-            
+
             if ($is_child) {
                 // determine what we're dealing with
                 if ($token->name == 'col') {
@@ -110,7 +110,7 @@ class HTMLPurifier_ChildDef_Table extends HTMLPurifier_ChildDef
                         $collection[] = $token;
                         continue;
                     default:
-                        if ($token instanceof HTMLPurifier_Token_Text && $token->is_whitespace) {
+                        if (!empty($token->is_whitespace)) {
                             $collection[] = $token;
                             $tag_index++;
                         }
@@ -118,9 +118,9 @@ class HTMLPurifier_ChildDef_Table extends HTMLPurifier_ChildDef
                 }
             }
         }
-        
+
         if (empty($content)) return false;
-        
+
         $ret = array();
         if ($caption !== false) $ret = array_merge($ret, $caption);
         if ($cols !== false)    foreach ($cols as $token_array) $ret = array_merge($ret, $token_array);
@@ -131,11 +131,12 @@ class HTMLPurifier_ChildDef_Table extends HTMLPurifier_ChildDef
             // grab the trailing space
             $ret = array_merge($ret, $collection);
         }
-        
+
         array_pop($tokens_of_children); // remove phantom token
-        
+
         return ($ret === $tokens_of_children) ? true : $ret;
-        
+
     }
 }
 
+// vim: et sw=4 sts=4