aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view
diff options
context:
space:
mode:
authorAkira Matsuda <ronnie@dio.jp>2013-01-28 15:23:31 +0900
committerAkira Matsuda <ronnie@dio.jp>2013-01-28 15:23:31 +0900
commit59deaecc76be1b9dcdc3c4865375287560add1d1 (patch)
treece769b5cee11c7dc76677316858e69a8a243dfeb /actionpack/lib/action_view
parent789df3be3eaad5861647f22b02d362fd36a40657 (diff)
downloadrails-59deaecc76be1b9dcdc3c4865375287560add1d1.tar.gz
rails-59deaecc76be1b9dcdc3c4865375287560add1d1.tar.bz2
rails-59deaecc76be1b9dcdc3c4865375287560add1d1.zip
Use already defined Encoding constants rather than creating one-trip Strings
Diffstat (limited to 'actionpack/lib/action_view')
-rw-r--r--actionpack/lib/action_view/template/error.rb2
-rw-r--r--actionpack/lib/action_view/template/handlers/erb.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/template/error.rb b/actionpack/lib/action_view/template/error.rb
index b479f991bc..a89d51221e 100644
--- a/actionpack/lib/action_view/template/error.rb
+++ b/actionpack/lib/action_view/template/error.rb
@@ -17,7 +17,7 @@ module ActionView
end
def message
- @string.force_encoding("BINARY")
+ @string.force_encoding(Encoding::ASCII_8BIT)
"Your template was not saved as valid #{@encoding}. Please " \
"either specify #{@encoding} as the encoding for your template " \
"in your text editor, or mark the template with its " \
diff --git a/actionpack/lib/action_view/template/handlers/erb.rb b/actionpack/lib/action_view/template/handlers/erb.rb
index afbbece90f..5aaafc15c1 100644
--- a/actionpack/lib/action_view/template/handlers/erb.rb
+++ b/actionpack/lib/action_view/template/handlers/erb.rb
@@ -81,7 +81,7 @@ module ActionView
# wrong, we can still find an encoding tag
# (<%# encoding %>) inside the String using a regular
# expression
- template_source = template.source.dup.force_encoding("BINARY")
+ template_source = template.source.dup.force_encoding(Encoding::ASCII_8BIT)
erb = template_source.gsub(ENCODING_TAG, '')
encoding = $2