From 7ea90955480c79fb07a0ca1b04736f39b3141cb7 Mon Sep 17 00:00:00 2001 From: Onur Kucukkece Date: Sat, 25 Aug 2018 12:24:54 +0300 Subject: [PATCH 1/3] support for rails 5 --- lib/facebook_dialog/railtie.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/facebook_dialog/railtie.rb b/lib/facebook_dialog/railtie.rb index d098df8..c0048d6 100644 --- a/lib/facebook_dialog/railtie.rb +++ b/lib/facebook_dialog/railtie.rb @@ -3,7 +3,7 @@ module FacebookDialog class Railtie < Rails::Railtie ActiveSupport.on_load(:action_controller) do - helper FacebookDialog::ScriptHelper + ::ActionController::Base.send(:include, FacebookDialog::ScriptHelper) if FacebookDialog.omniauth_enabled? require "facebook_dialog/omni_auth_helper" helper FacebookDialog::OmniAuthHelper From 71681bccfe1f2d3a6e302322cb49d713728b6b7f Mon Sep 17 00:00:00 2001 From: Onur Kucukkece Date: Sat, 25 Aug 2018 13:39:25 +0300 Subject: [PATCH 2/3] Revert "support for rails 5" This reverts commit 7ea90955480c79fb07a0ca1b04736f39b3141cb7. --- lib/facebook_dialog/railtie.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/facebook_dialog/railtie.rb b/lib/facebook_dialog/railtie.rb index c0048d6..d098df8 100644 --- a/lib/facebook_dialog/railtie.rb +++ b/lib/facebook_dialog/railtie.rb @@ -3,7 +3,7 @@ module FacebookDialog class Railtie < Rails::Railtie ActiveSupport.on_load(:action_controller) do - ::ActionController::Base.send(:include, FacebookDialog::ScriptHelper) + helper FacebookDialog::ScriptHelper if FacebookDialog.omniauth_enabled? require "facebook_dialog/omni_auth_helper" helper FacebookDialog::OmniAuthHelper From 77b087a7996e69df5d2af6f381c1c6acd32f6a85 Mon Sep 17 00:00:00 2001 From: Onur Kucukkece Date: Sat, 25 Aug 2018 13:40:27 +0300 Subject: [PATCH 3/3] using helper method with action_controller_base --- lib/facebook_dialog/railtie.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/facebook_dialog/railtie.rb b/lib/facebook_dialog/railtie.rb index d098df8..e701a12 100644 --- a/lib/facebook_dialog/railtie.rb +++ b/lib/facebook_dialog/railtie.rb @@ -2,7 +2,7 @@ module FacebookDialog class Railtie < Rails::Railtie - ActiveSupport.on_load(:action_controller) do + ActiveSupport.on_load(:action_controller_base) do helper FacebookDialog::ScriptHelper if FacebookDialog.omniauth_enabled? require "facebook_dialog/omni_auth_helper"