diff options
| -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 |