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.
# This method is only available if RedCloth can be required.
@@ -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.
# This method is only available if BlueCloth can be required.