#154 change order for smiley support check, to prevent raising error with invalid plugins if legacy smiley supported is inactive

This commit is contained in:
Alexander Meindl 2022-12-21 17:52:18 +01:00
parent 79783ed4e4
commit 897b615883

View File

@ -12,8 +12,8 @@ module Additionals
module InstanceMethods
def enable_smileys
return if Redmine::WikiFormatting::Textile::Formatter::RULES.include?(:inline_smileys) ||
!Additionals.setting?(:legacy_smiley_support)
return if !Additionals.setting?(:legacy_smiley_support) ||
Redmine::WikiFormatting::Textile::Formatter::RULES.include?(:inline_smileys)
Redmine::WikiFormatting::Textile::Formatter::RULES << :inline_smileys
end