sanitize.rb in sanitize-2.0.0.dev.20101225

- old
+ new

@@ -73,12 +73,13 @@
     @config       = Config::DEFAULT.merge(config)
     @transformers = Array(@config[:transformers].dup)
 
     # Default transformers. These always run at the end of the transformer
     # chain, after any custom transformers.
+    @transformers << Transformers::CleanComment unless @config[:allow_comments]
+
     @transformers <<
-        Transformers::CleanComment <<
         Transformers::CleanCDATA <<
         Transformers::CleanElement.new(@config)
   end
 
   # Returns a sanitized copy of _html_.
@@ -131,16 +132,16 @@
         :node           => node,
         :node_name      => node.name.downcase,
         :node_whitelist => node_whitelist
       })
 
-      # If the node has been unlinked, there's no point running subsequent
-      # transformers.
-      break if node.parent.nil? && !node.fragment?
-
       if result.is_a?(Hash) && result[:node_whitelist].respond_to?(:each)
         node_whitelist.merge(result[:node_whitelist])
       end
+
+      # If the node has been unlinked or replaced, there's no point running
+      # subsequent transformers.
+      break if node.parent.nil? && !node.fragment?
     end
 
     node
   end
 