From c1d65c8ae621d88b21cb84686325a584e8bc15da Mon Sep 17 00:00:00 2001
From: Zog
Date: Fri, 6 Apr 2018 10:09:10 +0200
Subject: Refs #6461; Don't initilialize CustomFields when they are not loaded
 by the model

---
 app/models/concerns/custom_fields_support.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app/models')

diff --git a/app/models/concerns/custom_fields_support.rb b/app/models/concerns/custom_fields_support.rb
index 017f496a8..ba4ea9912 100644
--- a/app/models/concerns/custom_fields_support.rb
+++ b/app/models/concerns/custom_fields_support.rb
@@ -33,6 +33,7 @@ module CustomFieldsSupport
     end
 
     def initialize_custom_fields
+      return unless self.attributes.has_key?("custom_field_values")
       self.custom_field_values ||= {}
       custom_fields(:all).values.each &:initialize_custom_field
       custom_fields(:all).each do |k, v|
-- 
cgit v1.2.3