aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRick Olson <technoweenie@gmail.com>2006-04-23 19:13:16 +0000
committerRick Olson <technoweenie@gmail.com>2006-04-23 19:13:16 +0000
commita9e02fd99fb2889fd25c20eeb5c0762e64d48719 (patch)
tree362f83932fecead89df73e836b53d8b7e97a4560
parente1c7b5a7f6dc412f0e523265e47fffe7b77e9724 (diff)
downloadrails-a9e02fd99fb2889fd25c20eeb5c0762e64d48719.tar.gz
rails-a9e02fd99fb2889fd25c20eeb5c0762e64d48719.tar.bz2
rails-a9e02fd99fb2889fd25c20eeb5c0762e64d48719.zip
only require redcloth/bluecloth if they are not already loaded [Rick]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4257 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-rw-r--r--actionpack/lib/action_view/helpers/text_helper.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/helpers/text_helper.rb b/actionpack/lib/action_view/helpers/text_helper.rb
index 80c80e3143..065f785f74 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_library_or_gem "redcloth"
+ require_library_or_gem "redcloth" unless Object.const_defined?(: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_library_or_gem "bluecloth"
+ require_library_or_gem "bluecloth" unless Object.const_defined?(: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>.