diff options
| author | wycats <wycats@gmail.com> | 2010-03-17 00:15:55 -0700 |
|---|---|---|
| committer | wycats <wycats@gmail.com> | 2010-03-17 00:20:09 -0700 |
| commit | a5587efc1903fd27d4b179753aa6e139445ad18c (patch) | |
| tree | 7642d070d3f876e4c11b7aea3cded9ec2ffd2d79 /activesupport/lib/active_support/core_ext/string | |
| parent | cd9ffd11e13ef6e62eba2cbd5c3760ff04132820 (diff) | |
| download | rails-a5587efc1903fd27d4b179753aa6e139445ad18c.tar.gz rails-a5587efc1903fd27d4b179753aa6e139445ad18c.tar.bz2 rails-a5587efc1903fd27d4b179753aa6e139445ad18c.zip | |
Remove some 1.9 warnings (resulting in some fixed bugs). Remaining AM warnings are in dependencies.
Diffstat (limited to 'activesupport/lib/active_support/core_ext/string')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/string/inflections.rb | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/core_ext/string/output_safety.rb | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/activesupport/lib/active_support/core_ext/string/inflections.rb b/activesupport/lib/active_support/core_ext/string/inflections.rb index fbb7b79fc6..48b028bb64 100644 --- a/activesupport/lib/active_support/core_ext/string/inflections.rb +++ b/activesupport/lib/active_support/core_ext/string/inflections.rb @@ -1,5 +1,3 @@ -require 'active_support/inflector' - # String inflections define new methods on the String class to transform names for different purposes. # For instance, you can figure out the name of a database from the name of a class. # diff --git a/activesupport/lib/active_support/core_ext/string/output_safety.rb b/activesupport/lib/active_support/core_ext/string/output_safety.rb index 9a7c520e75..5babc297c1 100644 --- a/activesupport/lib/active_support/core_ext/string/output_safety.rb +++ b/activesupport/lib/active_support/core_ext/string/output_safety.rb @@ -23,12 +23,14 @@ class ERB end end - undef :h + remove_method(:h) alias h html_escape - module_function :html_escape module_function :h + singleton_class.send(:remove_method, :html_escape) + module_function :html_escape + # A utility method for escaping HTML entities in JSON strings. # This method is also aliased as <tt>j</tt>. # |