From defb4d08dca88500f172da9e90e5af19187c7b08 Mon Sep 17 00:00:00 2001 From: Nicholas Seckar Date: Sat, 22 Sep 2007 19:02:51 +0000 Subject: [PATCH] Remove use of & logic operator. Closes #8114. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7571 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/CHANGELOG | 2 ++ actionpack/lib/action_controller/routing.rb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index c27933445a..df25ec800f 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Remove use of & logic operator. Closes #8114. [watson] + * Fixed JavaScriptHelper#escape_javascript to also escape closing tags #8023 [rubyruy] * Fixed TextHelper#word_wrap for multiline strings with extra carrier returns #8663 [seth] 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 @@ def ensure_required_segments(segments) 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