diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2011-08-04 11:49:43 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2011-08-04 11:49:43 -0700 |
| commit | d7e55c3429408cf446557d63ba9e2e555eb6d6f1 (patch) | |
| tree | e3f7853da85c1ada43e5ecf18d560ba440717565 /actionpack/lib/action_view/helpers | |
| parent | bf5b4c0055df4a02a57c53620badfcab48fc0cba (diff) | |
| parent | f0034c75d5a9bc5065652c2fedf39250a6f1847b (diff) | |
| download | rails-d7e55c3429408cf446557d63ba9e2e555eb6d6f1.tar.gz rails-d7e55c3429408cf446557d63ba9e2e555eb6d6f1.tar.bz2 rails-d7e55c3429408cf446557d63ba9e2e555eb6d6f1.zip | |
Merge pull request #2421 from pivotal-casebook/master
Simple_format should not edit it in place. (Fixes https://github.com/rails/rails/issues/1980)
Diffstat (limited to 'actionpack/lib/action_view/helpers')
| -rw-r--r-- | actionpack/lib/action_view/helpers/text_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/text_helper.rb b/actionpack/lib/action_view/helpers/text_helper.rb index ae71ade588..21074efe86 100644 --- a/actionpack/lib/action_view/helpers/text_helper.rb +++ b/actionpack/lib/action_view/helpers/text_helper.rb @@ -256,7 +256,7 @@ module ActionView # # => "<p><span>I'm allowed!</span> It's true.</p>" def simple_format(text, html_options={}, options={}) text = '' if text.nil? - text = text.dup if text.frozen? + text = text.dup start_tag = tag('p', html_options, true) text = sanitize(text) unless options[:sanitize] == false text = text.to_str |