diff options
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_view/helpers/text_helper.rb | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index d81c12f027..fa9f9ed09d 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fixed that textilize and markdown would instantiate their engines even on empty strings. This also fixes #333 [Ulysses] + * Added use of *_before_type_cast for all input and text fields. This is helpful for getting "100,000" back on a integer-based validation where the value would normally be "100". diff --git a/actionpack/lib/action_view/helpers/text_helper.rb b/actionpack/lib/action_view/helpers/text_helper.rb index 7e05e468b8..cb5a4578ee 100644 --- a/actionpack/lib/action_view/helpers/text_helper.rb +++ b/actionpack/lib/action_view/helpers/text_helper.rb @@ -69,7 +69,7 @@ module ActionView # Returns the text with all the Textile codes turned into HTML-tags. # <i>This method is only available if RedCloth can be required</i>. def textilize(text) - RedCloth.new(text).to_html + text.empty? ? "" : RedCloth.new(text).to_html end # Returns the text with all the Textile codes turned into HTML-tags, but without the regular bounding <p> tag. @@ -90,7 +90,7 @@ module ActionView # Returns the text with all the Markdown codes turned into HTML-tags. # <i>This method is only available if BlueCloth can be required</i>. def markdown(text) - BlueCloth.new(text).to_html + text.empty? ? "" : BlueCloth.new(text).to_html end rescue LoadError # We can't really help what's not there |