diff options
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/routing.rb | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index a4a7a605c8..a37e024a57 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Initialize @optional in routing code to avoid warnings about uninitialized access to an instance variable. [Nicholas Seckar] + * Make ActionController's render honor the :locals option when rendering a :file. #1665. [Emanuel Borsboom, Marcel Molina Jr.] * Allow assert_tag(:conditions) to match the empty string when a tag has no children. Closes #2959. [Jamis Buck] diff --git a/actionpack/lib/action_controller/routing.rb b/actionpack/lib/action_controller/routing.rb index 285d692f4e..f6489cdb14 100644 --- a/actionpack/lib/action_controller/routing.rb +++ b/actionpack/lib/action_controller/routing.rb @@ -100,6 +100,7 @@ module ActionController def initialize(key, options = {}) @key = key.to_sym + @optional = false default, @condition = options[:default], options[:condition] self.default = default if options.key?(:default) end |