diff --git a/lib/redmine_dmsf.rb b/lib/redmine_dmsf.rb index 33babe90..c6e6eb41 100644 --- a/lib/redmine_dmsf.rb +++ b/lib/redmine_dmsf.rb @@ -42,7 +42,7 @@ require "#{File.dirname(__FILE__)}/redmine_dmsf/patches/search_patch" require "#{File.dirname(__FILE__)}/redmine_dmsf/patches/custom_field_patch" # A workaround for obsolete 'alias_method' usage in RedmineUp's plugins -if RedmineDmsf::Plugin.an_obsolete_plugin_present? +if defined?(EasyExtensions) || RedmineDmsf::Plugin.an_obsolete_plugin_present? require "#{File.dirname(__FILE__)}/redmine_dmsf/patches/notifiable_ru_patch" else require "#{File.dirname(__FILE__)}/redmine_dmsf/patches/notifiable_patch" diff --git a/lib/redmine_dmsf/patches/notifiable_ru_patch.rb b/lib/redmine_dmsf/patches/notifiable_ru_patch.rb index e5047569..9d3f011f 100644 --- a/lib/redmine_dmsf/patches/notifiable_ru_patch.rb +++ b/lib/redmine_dmsf/patches/notifiable_ru_patch.rb @@ -48,6 +48,6 @@ module RedmineDmsf end # Apply the patch -if !defined?(EasyExtensions) && RedmineDmsf::Plugin.an_obsolete_plugin_present? +if defined?(EasyExtensions) || RedmineDmsf::Plugin.an_obsolete_plugin_present? Redmine::Notifiable.include RedmineDmsf::Patches::NotifiableRuPatch end