From 7cc84e4a25a4db2c6605ec2b2960c83c11e4d3a5 Mon Sep 17 00:00:00 2001 From: Angus McLeod Date: Thu, 30 Apr 2020 10:54:30 +1000 Subject: [PATCH] Remove enabled? check from extension prepension --- extensions/invites_controller.rb | 4 ++-- plugin.rb | 12 ++++-------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/extensions/invites_controller.rb b/extensions/invites_controller.rb index 1833bf38..fdba7723 100644 --- a/extensions/invites_controller.rb +++ b/extensions/invites_controller.rb @@ -8,11 +8,11 @@ module InvitesControllerCustomWizard url = "/w/#{wizard_id.dasherize}" end end - super(url) + super end private def post_process_invite(user) - super(user) + super @user = user end end \ No newline at end of file diff --git a/plugin.rb b/plugin.rb index d04ab66a..a6720d80 100644 --- a/plugin.rb +++ b/plugin.rb @@ -157,14 +157,10 @@ after_initialize do redirect_to_wizard_if_required if current_user end - reloadable_patch do |plugin| - if enabled? - ::ExtraLocalesController.prepend ExtraLocalesControllerCustomWizard - ::InvitesController.prepend InvitesControllerCustomWizard - ::Wizard::Field.prepend CustomWizardFieldExtension - ::Wizard::Step.prepend CustomWizardStepExtension - end - end + ::ExtraLocalesController.prepend ExtraLocalesControllerCustomWizard + ::InvitesController.prepend InvitesControllerCustomWizard + ::Wizard::Field.prepend CustomWizardFieldExtension + ::Wizard::Step.prepend CustomWizardStepExtension DiscourseEvent.trigger(:custom_wizard_ready) end