From 2805627acee2927c3a280333e004a77a730dc997 Mon Sep 17 00:00:00 2001
From: Jared Beck <jared@jaredbeck.com>
Date: Wed, 4 May 2016 14:01:16 -0400
Subject: [PATCH] Fix bug in AR integration

[Fixes #789]
---
 lib/paper_trail.rb                          | 4 ++++
 lib/paper_trail/frameworks/active_record.rb | 4 ----
 lib/paper_trail/frameworks/rails/engine.rb  | 1 -
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/lib/paper_trail.rb b/lib/paper_trail.rb
index 5131f5b5a..c5869b7e9 100644
--- a/lib/paper_trail.rb
+++ b/lib/paper_trail.rb
@@ -176,6 +176,10 @@ def version
   end
 end
 
+ActiveSupport.on_load(:active_record) do
+  include PaperTrail::Model
+end
+
 # Require frameworks
 require "paper_trail/frameworks/sinatra"
 if defined?(::Rails) && ActiveRecord::VERSION::STRING >= "3.2"
diff --git a/lib/paper_trail/frameworks/active_record.rb b/lib/paper_trail/frameworks/active_record.rb
index 8e833acfe..d79e7c10f 100644
--- a/lib/paper_trail/frameworks/active_record.rb
+++ b/lib/paper_trail/frameworks/active_record.rb
@@ -2,7 +2,3 @@
 # since otherwise the model(s) will get loaded in via the `Rails::Engine`.
 require "paper_trail/frameworks/active_record/models/paper_trail/version_association"
 require "paper_trail/frameworks/active_record/models/paper_trail/version"
-
-ActiveSupport.on_load(:active_record) do
-  include PaperTrail::Model
-end
diff --git a/lib/paper_trail/frameworks/rails/engine.rb b/lib/paper_trail/frameworks/rails/engine.rb
index 2ce3b7507..8793eb138 100644
--- a/lib/paper_trail/frameworks/rails/engine.rb
+++ b/lib/paper_trail/frameworks/rails/engine.rb
@@ -5,7 +5,6 @@ class Engine < ::Rails::Engine
       paths["app/models"] << "lib/paper_trail/frameworks/active_record/models"
       config.paper_trail = ActiveSupport::OrderedOptions.new
       initializer "paper_trail.initialisation" do |app|
-        ActiveRecord::Base.send :include, PaperTrail::Model
         PaperTrail.enabled = app.config.paper_trail.fetch(:enabled, true)
       end
     end