From b1c25596ac56d1aea58a0f058fec96ec3f26fe4e Mon Sep 17 00:00:00 2001
From: Kevin McNamee <kevin.mcnamee@bredband.net>
Date: Wed, 22 Feb 2012 21:20:19 +0100
Subject: [PATCH] Issue #1450996: Do recursive array merge of build modes.

---
 content.module |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/content.module b/content.module
index ea510c9..9334bb2 100644
--- a/content.module
+++ b/content.module
@@ -1906,7 +1906,7 @@ function content_build_modes($selector = NULL) {
     $data = array();
     foreach (module_implements('content_build_modes') as $module) {
       $function = $module .'_content_build_modes';
-      $data = array_merge($data, (array) $function());
+      $data = array_merge_recursive($data, (array) $function());
     }
     $flat = array();
     foreach ($data as $tab) {
@@ -2838,4 +2838,4 @@ function content_set_nested_elements(&$form, $field_name, $value) {
     }
   }
   return $success;
-}
\ No newline at end of file
+}
-- 
1.7.6