diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-03-02 10:54:16 -0300 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-03-02 11:07:42 -0300 |
| commit | 681d89f96bc1784edecf74992177a48be07e2b99 (patch) | |
| tree | 76e416e4858d8af5f7b0062293e0879396be0054 /activesupport | |
| parent | 9078dba7de7e703f1558b03502791b16225d18eb (diff) | |
| download | rails-681d89f96bc1784edecf74992177a48be07e2b99.tar.gz rails-681d89f96bc1784edecf74992177a48be07e2b99.tar.bz2 rails-681d89f96bc1784edecf74992177a48be07e2b99.zip | |
Stop SafeBuffer#clone_empty from issuing warnings
Logic in clone_empty method was dealing with old @dirty variable, which
has changed by @html_safe in this commit:
https://github.com/rails/rails/commit/139963c99a955520db6373343662e55f4d16dcd1
This was issuing a "not initialized variable" warning - related to:
https://github.com/rails/rails/pull/5237
The logic applied by this method is already handled by the [] override,
so there is no need to reset the variable here.
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/string/output_safety.rb | 4 |
1 files changed, 1 insertions, 3 deletions
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 728ab087fa..4903687b73 100644 --- a/activesupport/lib/active_support/core_ext/string/output_safety.rb +++ b/activesupport/lib/active_support/core_ext/string/output_safety.rb @@ -131,9 +131,7 @@ module ActiveSupport #:nodoc: end def clone_empty - new_safe_buffer = self[0, 0] - new_safe_buffer.instance_variable_set(:@dirty, @dirty) - new_safe_buffer + self[0, 0] end def concat(value) |