diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2010-12-04 10:41:31 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2010-12-04 10:41:31 +0000 |
| commit | 558a951ed64a3639ac08fdc7245dffab8607ab3f (patch) | |
| tree | 2dc74b74a68e1f8afe46b67e6c790a9a156e02af /lib | |
| parent | 37ed02553aee58d1b269c3ec8786bc8daff05484 (diff) | |
| download | redmine-558a951ed64a3639ac08fdc7245dffab8607ab3f.tar.gz redmine-558a951ed64a3639ac08fdc7245dffab8607ab3f.zip | |
Fixes unhandled case in json builder.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4463 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/redmine/views/builders/structure.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/redmine/views/builders/structure.rb b/lib/redmine/views/builders/structure.rb index c168bd73a..9b9481587 100644 --- a/lib/redmine/views/builders/structure.rb +++ b/lib/redmine/views/builders/structure.rb @@ -56,7 +56,11 @@ module Redmine if @struct.last.is_a?(Array) @struct.last << ret else - @struct.last[sym] = ret + if @struct.last.has_key?(sym) && @struct.last[sym].is_a?(Hash) + @struct.last[sym].merge! ret + else + @struct.last[sym] = ret + end end end end |