diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2011-11-06 17:27:44 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2011-11-06 17:27:44 +0530 |
| commit | 17947cebc0f397d091640defcfa7c42d42311d91 (patch) | |
| tree | c525b0a8141616525364050da5bdb06cb03a0361 /actionpack | |
| parent | 8a2f0a9623e38b667fd7970337e3be52ade7a0e7 (diff) | |
| parent | 949b3e743f9a2ff5935bb32a247d5df70586886a (diff) | |
| download | rails-17947cebc0f397d091640defcfa7c42d42311d91.tar.gz rails-17947cebc0f397d091640defcfa7c42d42311d91.tar.bz2 rails-17947cebc0f397d091640defcfa7c42d42311d91.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_view/helpers/form_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb index 5c10b67586..f148ffbd73 100644 --- a/actionpack/lib/action_view/helpers/form_helper.rb +++ b/actionpack/lib/action_view/helpers/form_helper.rb @@ -649,7 +649,7 @@ module ActionView # # => <label for="post_privacy_public">Public Post</label> # # label(:post, :terms) do - # 'Accept <a href="/terms">Terms</a>.' + # 'Accept <a href="/terms">Terms</a>.'.html_safe # end def label(object_name, method, content_or_options = nil, options = nil, &block) content_is_options = content_or_options.is_a?(Hash) @@ -738,7 +738,7 @@ module ActionView # # => <input type="file" id="user_avatar" name="user[avatar]" /> # # file_field(:post, :attached, :accept => 'text/html') - # # => <input type="file" id="post_attached" name="post[attached]" /> + # # => <input accept="text/html" type="file" id="post_attached" name="post[attached]" /> # # file_field(:attachment, :file, :class => 'file_input') # # => <input type="file" id="attachment_file" name="attachment[file]" class="file_input" /> |