diff options
| author | makoto kuwata <kwa@kuwata-lab.com> | 2007-05-26 15:44:43 +0000 |
|---|---|---|
| committer | makoto kuwata <kwa@kuwata-lab.com> | 2007-05-26 15:44:43 +0000 |
| commit | 85c3287725391d0d7eaafa66180962aa9b08af4a (patch) | |
| tree | 80829e2e525b54688b592872455f2f5f2e5dd729 | |
| parent | 5e76a039a0f8a7072eaf2322787f311e625726db (diff) | |
| download | erubis-85c3287725391d0d7eaafa66180962aa9b08af4a.tar.gz | |
- [bugfix] preprocessor bug is rails_helper.rb
| -rw-r--r-- | ChangeLog.txt | 3 | ||||
| -rw-r--r-- | lib/erubis/helpers/rails_helper.rb | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index a2dc192..ab7c571 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -2,6 +2,9 @@ .?lastupdate: $Date$ .?version: $Rev$ +: Rev.86 (2007-05-26) + .- [bugfix] preprocessor bug is rails_helper.rb + : Rev.85 (2007-05-26) .- [enhance] preprocessor support in rails_helper.rb diff --git a/lib/erubis/helpers/rails_helper.rb b/lib/erubis/helpers/rails_helper.rb index 526dddf..14a0b1c 100644 --- a/lib/erubis/helpers/rails_helper.rb +++ b/lib/erubis/helpers/rails_helper.rb @@ -6,6 +6,7 @@ require 'erubis' +require 'cgi' module Erubis @@ -227,7 +228,10 @@ class ActionView::Base # :nodoc: alias _x _expr alias _? _expr def _decode(arg) - return arg.to_s.gsub(/<%=(.*?)%>/, '<%=\1%>').gsub(/%3C%25%3D(.*?)%25%3E/, '<%=\1%>') + arg = arg.to_s + arg.gsub!(/%3C%25%3D(.*?)%25%3E/) { "<%=#{CGI.unescape($1)}%>" } + arg.gsub!(/<%=(.*?)%>/) { "<%=#{CGI.unescapeHTML($1)}%>" } + return arg end ## --------------------- |