Fixes unhandled case in json builder.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4463 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-04 10:41:31 +00:00
parent 37ed02553a
commit 558a951ed6
2 changed files with 12 additions and 1 deletions
@@ -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