diff options
author | David Heinemeier Hansson <david@envy8.local> | 2008-04-27 17:15:50 -0500 |
---|---|---|
committer | David Heinemeier Hansson <david@envy8.local> | 2008-04-27 17:15:50 -0500 |
commit | 162c7c1908946cfb48c201cfc5a4976a33c8bff1 (patch) | |
tree | f09f5e887bedb4d44a7c6884d471b0bdcc34293c /actionpack/lib/action_controller | |
parent | a37546517dad9f6d9a7de6e1dba4d960909d71e8 (diff) | |
download | rails-162c7c1908946cfb48c201cfc5a4976a33c8bff1.tar.gz rails-162c7c1908946cfb48c201cfc5a4976a33c8bff1.tar.bz2 rails-162c7c1908946cfb48c201cfc5a4976a33c8bff1.zip |
Changing "and" to && whereever I catch it
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r-- | actionpack/lib/action_controller/rescue.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/rescue.rb b/actionpack/lib/action_controller/rescue.rb index d4d561bdb7..3cf64070be 100644 --- a/actionpack/lib/action_controller/rescue.rb +++ b/actionpack/lib/action_controller/rescue.rb @@ -165,7 +165,7 @@ module ActionController #:nodoc: # method if you wish to redefine the meaning of a local request to # include remote IP addresses or other criteria. def local_request? #:doc: - request.remote_addr == LOCALHOST and request.remote_ip == LOCALHOST + request.remote_addr == LOCALHOST && request.remote_ip == LOCALHOST end # Render detailed diagnostics for unhandled exceptions rescued from |