aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view
diff options
context:
space:
mode:
authorDaniel Schierbeck <dasch@zendesk.com>2012-12-17 21:26:55 +0100
committerDaniel Schierbeck <dasch@zendesk.com>2013-02-20 16:17:55 +0100
commit445284906476f03acf37cab2b7dc265a985531c3 (patch)
treea014d1a4ec46735332a2ac17256f261faac05755 /actionpack/lib/action_view
parent9ca8c635f679ff7956496fd8e56a07f162f97fa2 (diff)
downloadrails-445284906476f03acf37cab2b7dc265a985531c3.tar.gz
rails-445284906476f03acf37cab2b7dc265a985531c3.tar.bz2
rails-445284906476f03acf37cab2b7dc265a985531c3.zip
Return an empty array if no tracker is found
Diffstat (limited to 'actionpack/lib/action_view')
-rw-r--r--actionpack/lib/action_view/dependency_tracker.rb9
1 files changed, 7 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/dependency_tracker.rb b/actionpack/lib/action_view/dependency_tracker.rb
index 3478e34fe3..b817b9bdd7 100644
--- a/actionpack/lib/action_view/dependency_tracker.rb
+++ b/actionpack/lib/action_view/dependency_tracker.rb
@@ -5,8 +5,13 @@ module ActionView
@trackers = ThreadSafe::Cache.new
def self.find_dependencies(name, template)
- handler = template.handler
- @trackers.fetch(handler).call(name, template)
+ tracker = @trackers[template.handler]
+
+ if tracker.present?
+ tracker.call(name, template)
+ else
+ []
+ end
end
def self.register_tracker(handler, tracker)