diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-06-19 19:47:54 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-06-19 19:47:54 +0000 |
| commit | 585d08765e91fadbbe3abf268339331622746b85 (patch) | |
| tree | 70bcc3c7b2a6fc202548a639b0d7781d92c33a4a /lib | |
| parent | 3b854bee59211a8a1889f3630c5316a71d182c70 (diff) | |
| download | redmine-585d08765e91fadbbe3abf268339331622746b85.tar.gz redmine-585d08765e91fadbbe3abf268339331622746b85.zip | |
Safe attributes for repositories.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9876 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/redmine/safe_attributes.rb | 6 |
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] |