diff options
| -rw-r--r-- | app/models/application_mailer.rb | 9 | ||||
| -rw-r--r-- | vendor/plugins/active_record_base_without_table/lib/active_record/base_without_table.rb | 3 |
2 files changed, 7 insertions, 5 deletions
diff --git a/app/models/application_mailer.rb b/app/models/application_mailer.rb index cdb279c3c..859e8a0e2 100644 --- a/app/models/application_mailer.rb +++ b/app/models/application_mailer.rb @@ -67,7 +67,8 @@ class ApplicationMailer < ActionMailer::Base return nil end - if ActionMailer::VERSION::MAJOR == 2 + # FIXME: This check was disabled temporarily during the Rails 3 upgrade + #if ActionMailer::VERSION::MAJOR == 2 # This method is a customised version of ActionMailer::Base.create! # modified to allow templates to be selected correctly for multipart @@ -142,9 +143,9 @@ class ApplicationMailer < ActionMailer::Base # build the mail object itself @mail = create_mail end - else - raise "ApplicationMailer.create! is obsolete - find another way to ensure that themes can override mail templates for multipart mails" - end + # else + # raise "ApplicationMailer.create! is obsolete - find another way to ensure that themes can override mail templates for multipart mails" + # end end diff --git a/vendor/plugins/active_record_base_without_table/lib/active_record/base_without_table.rb b/vendor/plugins/active_record_base_without_table/lib/active_record/base_without_table.rb index 12cb05e02..14e9f935d 100644 --- a/vendor/plugins/active_record_base_without_table/lib/active_record/base_without_table.rb +++ b/vendor/plugins/active_record_base_without_table/lib/active_record/base_without_table.rb @@ -13,7 +13,8 @@ module ActiveRecord def column(name, sql_type = nil, default = nil, null = true)
columns << ActiveRecord::ConnectionAdapters::Column.new(name.to_s, default, sql_type.to_s, null)
- reset_column_information
+ # FIXME: Disabled temporarily during Rails 3 upgrade
+ # reset_column_information
end
# Do not reset @columns
|