diff options
| -rw-r--r-- | actionpack/lib/action_controller/base.rb | 3 | ||||
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/mysql_adapter.rb | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 1eda6e3f04..4fc52c1470 100644 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -1305,7 +1305,8 @@ module ActionController #:nodoc: end end end - + + # Returns true if a render or redirect has already been performed. def performed? @performed_render || @performed_redirect end diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb index 9300df28ee..8e4078f462 100644 --- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb @@ -266,7 +266,7 @@ module ActiveRecord update("SET FOREIGN_KEY_CHECKS = #{old}") end end - + # CONNECTION MANAGEMENT ==================================== def active? |