aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorAndrew Kaspick <andrew@redlinesoftware.com>2010-07-17 17:25:08 -0500
committerwycats <wycats@gmail.com>2010-07-21 10:04:55 -0700
commita1a41a3939318e9481469ea194660f3d8a9c1e66 (patch)
tree4cc0371cdfefc77fa2fa0bb362009218307ea6cc /actionpack/lib
parentef5ae60a07c7d45855a9a2a4b695f153ef9faa79 (diff)
downloadrails-a1a41a3939318e9481469ea194660f3d8a9c1e66.tar.gz
rails-a1a41a3939318e9481469ea194660f3d8a9c1e66.tar.bz2
rails-a1a41a3939318e9481469ea194660f3d8a9c1e66.zip
remote_function patch with more detailed test
Signed-off-by: wycats <wycats@gmail.com>
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_view/helpers/prototype_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/prototype_helper.rb b/actionpack/lib/action_view/helpers/prototype_helper.rb
index 5c0ff5d59c..28b8a27eef 100644
--- a/actionpack/lib/action_view/helpers/prototype_helper.rb
+++ b/actionpack/lib/action_view/helpers/prototype_helper.rb
@@ -139,7 +139,7 @@ module ActionView
function = "if (#{options[:condition]}) { #{function}; }" if options[:condition]
function = "if (confirm('#{escape_javascript(options[:confirm])}')) { #{function}; }" if options[:confirm]
- return function
+ return function.html_safe
end
# All the methods were moved to GeneratorMethods so that