aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Landauer <matthew@openaustralia.org>2013-01-29 11:27:14 +1100
committerMatthew Landauer <matthew@openaustralia.org>2013-01-29 12:00:28 +1100
commit8dfffc7ae5b9b5e05f4da0d06e961975e02682b1 (patch)
treeb044cecf8ee0a7fc6ac40052c26bca066d70e030
parentbacb8f3f84a0e21b529ab3b7206af5a50c010b32 (diff)
Remove safe_html monkeypatch workarounds because things should now be correctly implemented
-rw-r--r--config/initializers/single_quote_escape_workaround.rb31
1 files changed, 0 insertions, 31 deletions
diff --git a/config/initializers/single_quote_escape_workaround.rb b/config/initializers/single_quote_escape_workaround.rb
deleted file mode 100644
index 2e713b982..000000000
--- a/config/initializers/single_quote_escape_workaround.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-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