diff options
| author | Jamis Buck <jamis@37signals.com> | 2013-01-08 12:02:11 -0700 |
|---|---|---|
| committer | Jamis Buck <jamis@37signals.com> | 2013-01-08 12:02:11 -0700 |
| commit | 0121377cfb864e3a455280ff00531c4b066848bb (patch) | |
| tree | 2253bc3d4812b5ae5ea3efeda53b2d3b2e584309 /actionpack/lib | |
| parent | 70e684a681352e95fb990747ef6dd7183da333a8 (diff) | |
| download | rails-0121377cfb864e3a455280ff00531c4b066848bb.tar.gz rails-0121377cfb864e3a455280ff00531c4b066848bb.tar.bz2 rails-0121377cfb864e3a455280ff00531c4b066848bb.zip | |
evaluate the dependency blocks at the instance level, not class level
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_controller/caching.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb index e31743bcc7..76b0048529 100644 --- a/actionpack/lib/action_controller/caching.rb +++ b/actionpack/lib/action_controller/caching.rb @@ -80,10 +80,6 @@ module ActionController def view_cache_dependency(&dependency) self._view_cache_dependencies += [dependency] end - - def view_cache_dependencies - _view_cache_dependencies.map { |dep| instance_exec &dep }.compact - end end def caching_allowed? @@ -91,7 +87,7 @@ module ActionController end def view_cache_dependencies - self.class.view_cache_dependencies + self.class._view_cache_dependencies.map { |dep| instance_exec &dep }.compact end protected |