@@ -55,7 +55,7 @@ module Ramaze # set_layout 'default' => [ :index, :admin ] def set_layout(hash_or_the_layout) if hash_or_the_layout.respond_to?(:to_hash) - f = hash_or_the_layout.first + f = hash_or_the_layout.to_hash.find{|k,v| k && v } the_layout = f[0] whitelist = f[1].map{|action| action.to_s } else @@ -78,7 +78,7 @@ module Ramaze # set_layout_except 'default' => [ :user_data ] def set_layout_except(hash_or_the_layout) if hash_or_the_layout.respond_to?(:to_hash) - f = hash_or_the_layout.to_hash.first + f = hash_or_the_layout.to_hash.find{|k,v| k && v } the_layout = f[0] blacklist = f[1].map{|action| action.to_s } else lib/ramaze/helper/layout.rb 21e47bb6a2f07e998faa6e8d84261ed6f3df0515 Michael Fellinger m.fellinger@gmail.com http://github.com/manveru/ramaze/commit/65470656b0814b6ccebc4f9fd93a6c28824028cb 65470656b0814b6ccebc4f9fd93a6c28824028cb 2009-07-02T03:13:41-07:00 2009-07-02T03:13:22-07:00 Layout helper asks for #to_hash, so it should use it. Also don't rely on Enumerable#first, not in 1.8.6 d7c7454823f0fc1751cb568d77807e793844e3e6 Michael Fellinger m.fellinger@gmail.com