Commit 2206163d by Mike Burns

Merge branch 'patch-1' of https://github.com/justinko/paperclip

parents c21f0fbf b0cb54ec
...@@ -18,8 +18,8 @@ module Paperclip ...@@ -18,8 +18,8 @@ module Paperclip
class Railtie class Railtie
def self.insert def self.insert
Paperclip.options[:logger] = Rails.logger Paperclip.options[:logger] = Rails.logger if defined?(Rails)
if defined?(ActiveRecord) if defined?(ActiveRecord)
ActiveRecord::Base.send(:include, Paperclip::Glue) ActiveRecord::Base.send(:include, Paperclip::Glue)
Paperclip.options[:logger] = ActiveRecord::Base.logger Paperclip.options[:logger] = ActiveRecord::Base.logger
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment