aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2012-03-02 06:45:27 -0800
committerJosé Valim <jose.valim@gmail.com>2012-03-02 06:45:27 -0800
commit974a9dbaa307a1b2ed79633366270aeeac778cd4 (patch)
tree76e416e4858d8af5f7b0062293e0879396be0054
parent9078dba7de7e703f1558b03502791b16225d18eb (diff)
parent681d89f96bc1784edecf74992177a48be07e2b99 (diff)
downloadrails-974a9dbaa307a1b2ed79633366270aeeac778cd4.tar.gz
rails-974a9dbaa307a1b2ed79633366270aeeac778cd4.tar.bz2
rails-974a9dbaa307a1b2ed79633366270aeeac778cd4.zip
Merge pull request #5241 from carlosantoniodasilva/output-safety
Stop SafeBuffer#clone_empty from issuing warnings
-rw-r--r--activesupport/lib/active_support/core_ext/string/output_safety.rb4
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)