diff options
| author | José Valim <jose.valim@gmail.com> | 2011-05-01 11:14:38 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-05-01 13:40:12 +0200 |
| commit | bebaccdf4a3a17f2ead349cca891032e245655ff (patch) | |
| tree | b0c1e7f663862251b58248a520478a99ed503635 /actionpack/lib/action_view/helpers | |
| parent | d08f65118cc328de5493a68db33a155487f5fceb (diff) | |
| download | rails-bebaccdf4a3a17f2ead349cca891032e245655ff.tar.gz rails-bebaccdf4a3a17f2ead349cca891032e245655ff.tar.bz2 rails-bebaccdf4a3a17f2ead349cca891032e245655ff.zip | |
Remove dependency from _template.
Diffstat (limited to 'actionpack/lib/action_view/helpers')
| -rw-r--r-- | actionpack/lib/action_view/helpers/form_helper.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_view/helpers/translation_helper.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb index 68db17c254..b6bb90a3ce 100644 --- a/actionpack/lib/action_view/helpers/form_helper.rb +++ b/actionpack/lib/action_view/helpers/form_helper.rb @@ -1172,7 +1172,7 @@ module ActionView class FormBuilder # The methods which wrap a form helper call. class_attribute :field_helpers - self.field_helpers = (FormHelper.instance_method_names - ['form_for']) + self.field_helpers = FormHelper.instance_method_names - %w(form_for convert_to_model) attr_accessor :object_name, :object, :options diff --git a/actionpack/lib/action_view/helpers/translation_helper.rb b/actionpack/lib/action_view/helpers/translation_helper.rb index 26ebae6546..ec9bdd5320 100644 --- a/actionpack/lib/action_view/helpers/translation_helper.rb +++ b/actionpack/lib/action_view/helpers/translation_helper.rb @@ -63,8 +63,8 @@ module ActionView private def scope_key_by_partial(key) if key.to_s.first == "." - if (path = @_template && @_template.virtual_path) - path.gsub(%r{/_?}, ".") + key.to_s + if @virtual_path + @virtual_path.gsub(%r{/_?}, ".") + key.to_s else raise "Cannot use t(#{key.inspect}) shortcut because path is not available" end |