From 558a951ed64a3639ac08fdc7245dffab8607ab3f Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 4 Dec 2010 10:41:31 +0000 Subject: Fixes unhandled case in json builder. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4463 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/views/builders/structure.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'lib') 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 -- cgit v1.2.3