diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-10-07 12:23:23 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-10-07 12:23:23 -0300 |
| commit | aadb09b13bf2ca2eab4569f187e1cc42b007ba33 (patch) | |
| tree | c6a76a138412ac35b03984a3ea519c7fc5cf7e48 /actionpack | |
| parent | f13a7bf4e17f265b340ca7d703caeed12716e386 (diff) | |
| parent | ff56f3d5e1c69b923625f20a80f25c2eee3bbb35 (diff) | |
| download | rails-aadb09b13bf2ca2eab4569f187e1cc42b007ba33.tar.gz rails-aadb09b13bf2ca2eab4569f187e1cc42b007ba33.tar.bz2 rails-aadb09b13bf2ca2eab4569f187e1cc42b007ba33.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_view/base.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb index ec1b07797b..664cc3b562 100644 --- a/actionpack/lib/action_view/base.rb +++ b/actionpack/lib/action_view/base.rb @@ -236,7 +236,12 @@ module ActionView #:nodoc: # they are in AC. if controller.class.respond_to?(:_helper_serial) klass = @views[controller.class._helper_serial] ||= Class.new(self) do - Subclasses.const_set(controller.class.name.gsub(/::/, '__'), self) + name = controller.class.name.gsub(/::/, '__') + + Subclasses.class_eval do + remove_const(name) if const_defined?(name) + const_set(name, self) + end if controller.respond_to?(:_helpers) include controller._helpers |