diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-06-22 22:15:27 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-06-22 22:15:27 +0530 |
| commit | 35ee8fa3d8b3ad49179f86af2bec2e53af335ac9 (patch) | |
| tree | 5929e772a461c683c54c1fd66b303516e5d0df33 /actionpack | |
| parent | fb8cf55868d555b7f06215db5976c8aaf083d30b (diff) | |
| parent | 6285675db1cf983ba6c15442aedb457c8041f5ee (diff) | |
| download | rails-35ee8fa3d8b3ad49179f86af2bec2e53af335ac9.tar.gz rails-35ee8fa3d8b3ad49179f86af2bec2e53af335ac9.tar.bz2 rails-35ee8fa3d8b3ad49179f86af2bec2e53af335ac9.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_view/helpers/form_helper.rb | 1 | ||||
| -rw-r--r-- | actionpack/lib/action_view/helpers/url_helper.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb index 7dd35f7357..ba2a26fd09 100644 --- a/actionpack/lib/action_view/helpers/form_helper.rb +++ b/actionpack/lib/action_view/helpers/form_helper.rb @@ -979,6 +979,7 @@ module ActionView def telephone_field(object_name, method, options = {}) Tags::TelField.new(object_name, method, self, options).render end + # aliases telephone_field alias phone_field telephone_field # Returns a text_field of type "date". diff --git a/actionpack/lib/action_view/helpers/url_helper.rb b/actionpack/lib/action_view/helpers/url_helper.rb index 7f5b3c8a0f..736f9fa2f0 100644 --- a/actionpack/lib/action_view/helpers/url_helper.rb +++ b/actionpack/lib/action_view/helpers/url_helper.rb @@ -23,7 +23,7 @@ module ActionView include ActionDispatch::Routing::UrlFor include TagHelper - # We need to override url_optoins, _routes_context + # We need to override url_options, _routes_context # and optimize_routes_generation? to consider the controller. def url_options #:nodoc: |