Skip to content

P
paperclip
Commit 8c537796 by Tute Costa
Options

Merge pull request #2060 from tonidas/master 

Fix condition to include Schema, using 'ActiveRecord::Base' instead o…
parents 358e4774 8f7f29fc
Showing with 1 additions and 1 deletions
lib/paperclip/glue.rb
...@@ -8,7 +8,7 @@ module Paperclip ...@@ -8,7 +8,7 @@ module Paperclip
base.extend ClassMethods base.extend ClassMethods
base.send :include, Callbacks base.send :include, Callbacks
base.send :include, Validators base.send :include, Validators
base.send :include, Schema if defined? ActiveRecord base.send :include, Schema if defined? ActiveRecord::Base
locale_path = Dir.glob(File.dirname(__FILE__) + "/locales/*.{rb,yml}") locale_path = Dir.glob(File.dirname(__FILE__) + "/locales/*.{rb,yml}")
I18n.load_path += locale_path unless I18n.load_path.include?(locale_path) I18n.load_path += locale_path unless I18n.load_path.include?(locale_path)
......
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