1 files changed, 4 insertions, 0 deletions
diff --git a/actionpack/lib/action_view/template/handlers/erb.rb b/actionpack/lib/action_view/template/handlers/erb.rb
index 937694ce8e..2ac68d38bd 100644
--- a/actionpack/lib/action_view/template/handlers/erb.rb
+++ b/actionpack/lib/action_view/template/handlers/erb.rb
@@ -41,6 +41,10 @@ module ActionView
     end
 
     if "".respond_to?(:force_encoding)
+      def encoding
+        @buffer.encoding
+      end
+
       def force_encoding(encoding)
         @buffer.force_encoding(encoding)
       end