Merge branch 'release/0.6.4'0.6.4

1 files changed, 31 insertions, 0 deletions

diff --git a/config/initializers/single_quote_escape_workaround.rb b/config/initializers/single_quote_escape_workaround.rb
new file mode 100644
index 000000000..2e713b982
--- /dev/null
+++ b/config/initializers/single_quote_escape_workaround.rb
@@ -0,0 +1,31 @@
+class ERB

+  module Util

+

+    if "html_safe exists".respond_to?(:html_safe)

+      def html_escape(s)

+        s = s.to_s

+        if s.html_safe?

+          s

+        else

+          Rack::Utils.escape_html(s).html_safe

+        end

+      end

+    else

+      def html_escape(s)

+        s = s.to_s

+        Rack::Utils.escape_html(s).html_safe

+      end

+    end

+

+    remove_method :h

+    alias h html_escape

+

+    class << self

+      remove_method :html_escape

+      remove_method :h

+    end

+

+    module_function :html_escape

+    module_function :h

+  end

+end