summaryrefslogtreecommitdiffstats
path: root/lib/redmine/safe_attributes.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/redmine/safe_attributes.rb')
-rw-r--r--lib/redmine/safe_attributes.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/redmine/safe_attributes.rb b/lib/redmine/safe_attributes.rb
index b8694a34d..75c2e43de 100644
--- a/lib/redmine/safe_attributes.rb
+++ b/lib/redmine/safe_attributes.rb
@@ -31,7 +31,11 @@ module Redmine
def safe_attributes(*args)
@safe_attributes ||= []
if args.empty?
- @safe_attributes
+ if superclass.include?(Redmine::SafeAttributes)
+ @safe_attributes + superclass.safe_attributes
+ else
+ @safe_attributes
+ end
else
options = args.last.is_a?(Hash) ? args.pop : {}
@safe_attributes << [args, options]