aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/template/resolver.rb
diff options
context:
space:
mode:
authorEmilio Tagua <miloops@gmail.com>2009-08-27 15:56:16 -0300
committerEmilio Tagua <miloops@gmail.com>2009-08-27 15:56:16 -0300
commitd395391e1dfae4531671fbb09911e6b9418474ba (patch)
tree65d679e11c15de32c18a4303d6dcb9f88f2a0925 /actionpack/lib/action_view/template/resolver.rb
parent286f47f3b034db4550110b9a0f9ff48dda29e807 (diff)
parentc10396b1426fcddea35d88fe865846b8aaab5de4 (diff)
downloadrails-d395391e1dfae4531671fbb09911e6b9418474ba.tar.gz
rails-d395391e1dfae4531671fbb09911e6b9418474ba.tar.bz2
rails-d395391e1dfae4531671fbb09911e6b9418474ba.zip
Merge commit 'rails/master'
Diffstat (limited to 'actionpack/lib/action_view/template/resolver.rb')
-rw-r--r--actionpack/lib/action_view/template/resolver.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/template/resolver.rb b/actionpack/lib/action_view/template/resolver.rb
index fe657166d5..0b4c62d4d0 100644
--- a/actionpack/lib/action_view/template/resolver.rb
+++ b/actionpack/lib/action_view/template/resolver.rb
@@ -4,7 +4,7 @@ require "action_view/template/template"
module ActionView
# Abstract superclass
class Resolver
- def initialize(options)
+ def initialize(options = {})
@cache = options[:cache]
@cached = {}
end