From defb4d08dca88500f172da9e90e5af19187c7b08 Mon Sep 17 00:00:00 2001 From: Nicholas Seckar Date: Sat, 22 Sep 2007 19:02:51 +0000 Subject: Remove use of & logic operator. Closes #8114. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7571 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_controller/routing.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionpack/lib') diff --git a/actionpack/lib/action_controller/routing.rb b/actionpack/lib/action_controller/routing.rb index d1df7e6b43..0d78641b15 100644 --- a/actionpack/lib/action_controller/routing.rb +++ b/actionpack/lib/action_controller/routing.rb @@ -980,7 +980,7 @@ module ActionController warn "Route segment \"#{segment.to_s}\" cannot be optional because it precedes a required segment. This segment will be required." end segment.is_optional = false - elsif allow_optional & segment.respond_to?(:default) && segment.default + elsif allow_optional && segment.respond_to?(:default) && segment.default # if a segment has a default, then it is optional segment.is_optional = true end -- cgit v1.2.3