aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/template/handlers/erb.rb
diff options
context:
space:
mode:
authorYehuda Katz <wycats@Yehuda-Katz.local>2010-01-31 23:42:35 -0800
committerYehuda Katz <wycats@Yehuda-Katz.local>2010-01-31 23:42:35 -0800
commit209235165266ff39f2d14d02b497d7d703788104 (patch)
treead0bf195d871993d089848ac5fc599be797ad0db /actionpack/lib/action_view/template/handlers/erb.rb
parent1adfb9213576bd4a548a66bb46e2a2272e15e48d (diff)
downloadrails-209235165266ff39f2d14d02b497d7d703788104.tar.gz
rails-209235165266ff39f2d14d02b497d7d703788104.tar.bz2
rails-209235165266ff39f2d14d02b497d7d703788104.zip
Add support for compile-time <%= raw %>
Diffstat (limited to 'actionpack/lib/action_view/template/handlers/erb.rb')
-rw-r--r--actionpack/lib/action_view/template/handlers/erb.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/template/handlers/erb.rb b/actionpack/lib/action_view/template/handlers/erb.rb
index 51753aaad3..4573a440d1 100644
--- a/actionpack/lib/action_view/template/handlers/erb.rb
+++ b/actionpack/lib/action_view/template/handlers/erb.rb
@@ -15,7 +15,11 @@ module ActionView
end
def add_expr_literal(src, code)
- src << '@output_buffer << ((' << code << ').to_s);'
+ if code =~ /\s*raw\s+(.*)/
+ src << "@output_buffer.safe_concat((" << $1 << ").to_s);"
+ else
+ src << '@output_buffer << ((' << code << ').to_s);'
+ end
end
def add_expr_escaped(src, code)