Merge pull request from GHSA-65f2-9ghp-x8h8
This commit is contained in:
parent
6c659020ab
commit
6222eec8fc
|
@ -280,6 +280,7 @@ after_initialize do
|
|||
allow_staff_user_custom_field(DiscourseCalendar::HOLIDAY_CUSTOM_FIELD)
|
||||
DiscoursePluginRegistry.serialized_current_user_fields << DiscourseCalendar::REGION_CUSTOM_FIELD
|
||||
register_editable_user_custom_field(DiscourseCalendar::REGION_CUSTOM_FIELD)
|
||||
register_user_custom_field_type(DiscourseCalendar::REGION_CUSTOM_FIELD, :string, max_length: 40)
|
||||
|
||||
on(:site_setting_changed) do |name, old_value, new_value|
|
||||
next unless %i[all_day_event_start_time all_day_event_end_time].include? name
|
||||
|
|
Loading…
Reference in New Issue