aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view.rb
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib/action_view.rb')
-rw-r--r--actionpack/lib/action_view.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/lib/action_view.rb b/actionpack/lib/action_view.rb
index 93aa69c060..20a2a63621 100644
--- a/actionpack/lib/action_view.rb
+++ b/actionpack/lib/action_view.rb
@@ -56,7 +56,9 @@ module ActionView
autoload :TestCase, 'action_view/test_case'
end
-require 'action_view/erb/util'
+require 'active_support/core_ext/string/output_safety'
require 'action_view/base'
+ActionView::SafeBuffer = ActiveSupport::SafeBuffer
+
I18n.load_path << "#{File.dirname(__FILE__)}/action_view/locale/en.yml"