diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2006-03-27 23:40:29 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2006-03-27 23:40:29 +0000 |
| commit | 80081d18f23c6ad5952ba2620fabd06577503735 (patch) | |
| tree | 008a3dc6fde860f6330d31e76e5a08ad3ad4918e /actionpack | |
| parent | c9c185200df71c8aaa5ed42e39531191e76690e4 (diff) | |
| download | rails-80081d18f23c6ad5952ba2620fabd06577503735.tar.gz rails-80081d18f23c6ad5952ba2620fabd06577503735.tar.bz2 rails-80081d18f23c6ad5952ba2620fabd06577503735.zip | |
Fixed require of bluecloth and redcloth when gems haven't been loaded (closes #4446) [murphy@cYcnus.de]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4070 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
| -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 b102e3acb4..3e8ea28f1f 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fixed require of bluecloth and redcloth when gems haven't been loaded #4446 [murphy@cYcnus.de] + * Update to Prototype 1.5.0_pre1 [Sam Stephenson] * Change #form_for and #fields_for so that the second argument is not required [Dave Thomas] diff --git a/actionpack/lib/action_view/helpers/text_helper.rb b/actionpack/lib/action_view/helpers/text_helper.rb index 856c997e9a..80c80e3143 100644 --- a/actionpack/lib/action_view/helpers/text_helper.rb +++ b/actionpack/lib/action_view/helpers/text_helper.rb @@ -77,7 +77,7 @@ module ActionView end begin - require "redcloth" + require_library_or_gem "redcloth" # Returns the text with all the Textile codes turned into HTML-tags. # <i>This method is only available if RedCloth can be required</i>. @@ -104,7 +104,7 @@ module ActionView end begin - require "bluecloth" + require_library_or_gem "bluecloth" # Returns the text with all the Markdown codes turned into HTML-tags. # <i>This method is only available if BlueCloth can be required</i>. |