diff options
| author | José Valim <jose.valim@gmail.com> | 2012-05-12 14:42:35 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-05-12 14:42:35 +0200 |
| commit | eab0520e132e373618f6e3ce585ebd71ec501e97 (patch) | |
| tree | 259dc98963312cfa2ae73e96f92f19d94c1815b6 /actionpack/lib/action_view/helpers/form_tag_helper.rb | |
| parent | 3a59eab5f78f4c11915eba150c88ce384d046dff (diff) | |
| download | rails-eab0520e132e373618f6e3ce585ebd71ec501e97.tar.gz rails-eab0520e132e373618f6e3ce585ebd71ec501e97.tar.bz2 rails-eab0520e132e373618f6e3ce585ebd71ec501e97.zip | |
Revert "Merge pull request #6142 from spartan-developer/master"
This reverts commit 667d0bdd90ef6e6b691f0cc4cf5535b8da69f248, reversing
changes made to 4ae6bab6bb02c9390188a49f9a749400f6a0ac94.
Diffstat (limited to 'actionpack/lib/action_view/helpers/form_tag_helper.rb')
| -rw-r--r-- | actionpack/lib/action_view/helpers/form_tag_helper.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/form_tag_helper.rb b/actionpack/lib/action_view/helpers/form_tag_helper.rb index 7cdb09d7d2..248cc2f6a3 100644 --- a/actionpack/lib/action_view/helpers/form_tag_helper.rb +++ b/actionpack/lib/action_view/helpers/form_tag_helper.rb @@ -317,7 +317,9 @@ module ActionView def text_area_tag(name, content = nil, options = {}) options = options.stringify_keys - extract_size!(options, 'cols', 'rows') + if size = options.delete("size") + options["cols"], options["rows"] = size.split("x") if size.respond_to?(:split) + end escape = options.delete("escape") { true } content = ERB::Util.html_escape(content) if escape |