From 486af0254a3abbecb6a9ca8cf32c01c7160c4078 Mon Sep 17 00:00:00 2001 From: Jamis Buck Date: Thu, 8 Jun 2006 17:19:58 +0000 Subject: Fix strip_links so that it doesn't hang on multi-line acronym tags git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4446 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/CHANGELOG | 2 ++ actionpack/lib/action_view/helpers/text_helper.rb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'actionpack') diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index d4935278df..34e2ff6a88 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fix strip_links so that it doesn't hang on multiline tags [Jamis Buck] + * Remove problematic control chars in rescue template. #5316 [Stefan Kaes] * Make sure passed routing options are not mutated by routing code. #5314 [Blair Zajac] diff --git a/actionpack/lib/action_view/helpers/text_helper.rb b/actionpack/lib/action_view/helpers/text_helper.rb index a777c64ecc..2040c52a71 100644 --- a/actionpack/lib/action_view/helpers/text_helper.rb +++ b/actionpack/lib/action_view/helpers/text_helper.rb @@ -152,7 +152,7 @@ module ActionView # Turns all links into words, like "else" to "else". def strip_links(text) - text.gsub(/(.*)<\/a>/m, '\1') + text.gsub(/(.*?)<\/a>/m, '\1') end # Try to require the html-scanner library -- cgit v1.2.3