Permalink
Browse files

We can't assign @view_context_class here, define super() in test inst…

…ead if we want to avoid warnings.
  • Loading branch information...
miloops committed Sep 29, 2010
1 parent c37800a commit 6371e5b99f933ebe462784b5272fdf12e9602e5a
Showing with 2 additions and 1 deletion.
  1. +1 −1 actionpack/lib/abstract_controller/rendering.rb
  2. +1 −0 actionpack/test/controller/filters_test.rb
@@ -66,7 +66,7 @@ def view_context_class
attr_writer :view_context_class
def view_context_class
- @view_context_class ||= self.class.view_context_class
+ @view_context_class || self.class.view_context_class
end
def initialize(*)
@@ -314,6 +314,7 @@ class MixedFilterController < PrependingController
def initialize
@@execution_log = ""
+ super()
end
before_filter { |c| c.class.execution_log << " before procfilter " }

0 comments on commit 6371e5b

Please sign in to comment.