Ruby on Rails | Screencasts | Download | Documentation | Weblog | Community | Source

Changeset 7677

Show
Ignore:
Timestamp:
09/29/07 20:19:33 (1 year ago)
Author:
david
Message:

Fixed that strip_tags blows up with invalid html (closes #9730) [lifo]

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/actionpack/lib/action_view/helpers/text_helper.rb

    r7666 r7677  
    330330      #   # => Blog: Visit 
    331331      def strip_links(html) 
    332         if !html.blank? && html.index("<a") || html.index("<href") 
     332        if !html.blank? && (html.index("<a") || html.index("<href")) && html.index(">") 
    333333          tokenizer = HTML::Tokenizer.new(html) 
    334334          result = returning [] do |result| 
    …… 
    337337              result << node.to_s unless node.is_a?(HTML::Tag) && ["a", "href"].include?(node.name)  
    338338            end  
    339           end 
    340           strip_links(result.join) # Recurse - handle all dirty nested links 
     339          end.join 
     340          result == html ? result : strip_links(result) # Recurse - handle all dirty nested links 
    341341        else 
    342342          html 
    …… 
    469469        # strip any comments, and if they have a newline at the end (ie. line with 
    470470        # only a comment) strip that too 
     471        result = text.join.gsub(/<!--(.*?)-->[\n]?/m, "") 
     472         
    471473        # Recurse - handle all dirty nested tags 
    472         strip_tags(text.join.gsub(/<!--(.*?)-->[\n]?/m, "")) 
     474        result == html ? result : strip_tags(result) 
    473475      end 
    474476       

  • trunk/actionpack/test/template/text_helper_test.rb

    r7596 r7677  
    4949  def test_strip_links 
    5050    assert_equal "Dont touch me", strip_links("Dont touch me") 
     51    assert_equal "<a<a", strip_links("<a<a") 
    5152    assert_equal "on my mind\nall day long", strip_links("<a href='almost'>on my mind</a>\n<A href='almost'>all day long</A>") 
    5253    assert_equal "0wn3d", strip_links("<a href='http://www.rubyonrails.com/'><a href='http://www.rubyonrails.com/' onlclick='steal()'>0wn3d</a></a>")  
    …… 
    538539 
    539540  def test_strip_tags 
     541    assert_equal("<<<bad html", strip_tags("<<<bad html")) 
     542    assert_equal("<<", strip_tags("<<<bad html>")) 
    540543    assert_equal("Dont touch me", strip_tags("Dont touch me")) 
    541544    assert_equal("This is a test.", strip_tags("<p>This <u>is<u> a <a href='test.html'><strong>test</strong></a>.</p>"))