diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2004-12-31 16:48:02 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2004-12-31 16:48:02 +0000 |
| commit | 2dd2b56482a4e102251258e3c2458618de8897c2 (patch) | |
| tree | 41345e9f807e1593d7b1028c5fa27b416545f865 | |
| parent | 670fa63342c12413f3bf23f8f5d4744e91769f0b (diff) | |
| download | rails-2dd2b56482a4e102251258e3c2458618de8897c2.tar.gz rails-2dd2b56482a4e102251258e3c2458618de8897c2.tar.bz2 rails-2dd2b56482a4e102251258e3c2458618de8897c2.zip | |
Auto-requiring of helpers should stay silent when it isn't found for whatever reason
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@290 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/helpers.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 4311b28e30..4c5365f032 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fixed that @request.remote_ip didn't work in the test environment #369 [Bruno Mattarollo] + * Added :host and :protocol options to url_for and friends to redirect to another host and protocol than the current. diff --git a/actionpack/lib/action_controller/helpers.rb b/actionpack/lib/action_controller/helpers.rb index 0e1ff7dd16..ae49f5ba87 100644 --- a/actionpack/lib/action_controller/helpers.rb +++ b/actionpack/lib/action_controller/helpers.rb @@ -96,7 +96,7 @@ module ActionController #:nodoc: inherited_without_helper(child) begin child.helper(child.controller_name) - rescue LoadError + rescue LoadError, StandardError # No default helper available for this controller end end |