aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorErik St. Martin <alakriti@gmail.com>2010-01-26 10:59:18 -0500
committerStefan Penner <stefan.penner@gmail.com>2010-01-27 12:44:35 -0600
commit6a8da2053eb1e833347e5ed5dc578fc47cdf9309 (patch)
treeaf7363fa903f0390ec6211f6299ba6aa2b486173 /actionpack
parentad26b3934ecb9f5034453b4cd7d924048798d429 (diff)
downloadrails-6a8da2053eb1e833347e5ed5dc578fc47cdf9309.tar.gz
rails-6a8da2053eb1e833347e5ed5dc578fc47cdf9309.tar.bz2
rails-6a8da2053eb1e833347e5ed5dc578fc47cdf9309.zip
need to tell erb that our <script> tag is html_safe
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_view/helpers/ajax_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/ajax_helper.rb b/actionpack/lib/action_view/helpers/ajax_helper.rb
index 6eba108ff0..b570eb44a7 100644
--- a/actionpack/lib/action_view/helpers/ajax_helper.rb
+++ b/actionpack/lib/action_view/helpers/ajax_helper.rb
@@ -502,7 +502,7 @@ module ActionView
def script_decorator(options)
attributes = %w(type="application/json")
attributes += options.map{|k, v| k + '="' + v.to_s + '"'}
- "<script " + attributes.join(" ") + "></script>"
+ "<script " + attributes.join(" ") + "></script>".html_safe!
end
private