diff --git a/app/models/site_setting.rb b/app/models/site_setting.rb index 33799aba840..0bbaf508606 100644 --- a/app/models/site_setting.rb +++ b/app/models/site_setting.rb @@ -238,11 +238,11 @@ class SiteSetting < ActiveRecord::Base ALLOWLIST_DEPRECATED_SITE_SETTINGS.each_pair do |old_method, new_method| self.define_singleton_method(old_method) do - Discourse.deprecate("#{old_method.to_s} is deprecated, use the #{new_method.to_s}.", drop_from: "2.6") + Discourse.deprecate("#{old_method.to_s} is deprecated, use the #{new_method.to_s}.", drop_from: "2.6", raise_error: true) send(new_method) end self.define_singleton_method("#{old_method}=") do |args| - Discourse.deprecate("#{old_method.to_s} is deprecated, use the #{new_method.to_s}.", drop_from: "2.6") + Discourse.deprecate("#{old_method.to_s} is deprecated, use the #{new_method.to_s}.", drop_from: "2.6", raise_error: true) send("#{new_method}=", args) end end diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb index d24e49e3749..71b92a42de0 100644 --- a/lib/plugin/instance.rb +++ b/lib/plugin/instance.rb @@ -157,7 +157,7 @@ class Plugin::Instance end def whitelist_staff_user_custom_field(field) - Discourse.deprecate("whitelist_staff_user_custom_field is deprecated, use the allow_staff_user_custom_field.", drop_from: "2.6") + Discourse.deprecate("whitelist_staff_user_custom_field is deprecated, use the allow_staff_user_custom_field.", drop_from: "2.6", raise_error: true) allow_staff_user_custom_field(field) end @@ -166,7 +166,7 @@ class Plugin::Instance end def whitelist_public_user_custom_field(field) - Discourse.deprecate("whitelist_public_user_custom_field is deprecated, use the allow_public_user_custom_field.", drop_from: "2.6") + Discourse.deprecate("whitelist_public_user_custom_field is deprecated, use the allow_public_user_custom_field.", drop_from: "2.6", raise_error: true) allow_public_user_custom_field(field) end @@ -319,7 +319,7 @@ class Plugin::Instance end def topic_view_post_custom_fields_whitelister(&block) - Discourse.deprecate("topic_view_post_custom_fields_whitelister is deprecated, use the topic_view_post_custom_fields_allowlister.", drop_from: "2.6") + Discourse.deprecate("topic_view_post_custom_fields_whitelister is deprecated, use the topic_view_post_custom_fields_allowlister.", drop_from: "2.6", raise_error: true) topic_view_post_custom_fields_allowlister(&block) end