@@ -176,9 +176,8 @@ module Merb # Behavior:: The new behavior. def match_without_path(conditions = {}) params = conditions.delete(:params) || {} #parents params will be merged in Route#new - params[:controller] = conditions.delete(:controller) || params[:controller] - params[:action] = conditions.delete(:action) || params[:action] - params.delete_if{|_k,value| value.nil?} + params[:controller] = conditions.delete(:controller) if conditions[:controller] + params[:action] = conditions.delete(:action) if conditions[:action] new_behavior = self.class.new(conditions, params, self) yield new_behavior if block_given? new_behavior lib/merb-core/dispatch/router/behavior.rb 6b3fa01328ada93ac37c34173f2dbfde168d13c9 StarTrader Emperor@antarestrader.com http://github.com/wycats/merb-core/commit/28d86fa31c6409e406d96c6b0642e8d3e27644b6 28d86fa31c6409e406d96c6b0642e8d3e27644b6 2008-05-16T15:11:53-07:00 2008-05-16T09:48:27-07:00 Code clean-up behavior.rb Modified the extraction of :controller and :action to be much more civilized and not require a loop through all keys. All Tests Pass modified: lib/merb-core/dispatch/router/behavior.rb Signed-off-by: Michael S. Klishin <michael@novemberain.com> ecb41a5a1316104e19ab176d183982ceda438fc1 Michael S. Klishin michael@novemberain.com