From d18568c3951051a8fbf4624cd0b758d268efa58c Mon Sep 17 00:00:00 2001
From: Robbie Averill <robbie@silverstripe.com>
Date: Mon, 11 Sep 2017 14:11:09 +1200
Subject: [PATCH] FIX Ensure client config merging includes existing parent
 "form" attributes

---
 code/Controllers/CMSPageEditController.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/Controllers/CMSPageEditController.php b/code/Controllers/CMSPageEditController.php
index 05cd4586..fe68f93f 100644
--- a/code/Controllers/CMSPageEditController.php
+++ b/code/Controllers/CMSPageEditController.php
@@ -10,6 +10,7 @@ use SilverStripe\Control\Controller;
 use SilverStripe\Control\HTTPRequest;
 use SilverStripe\Control\HTTPResponse;
 use SilverStripe\Forms\Form;
+use SilverStripe\ORM\ArrayLib;
 use SilverStripe\ORM\FieldType\DBHTMLText;
 use SilverStripe\ORM\ValidationResult;
 
@@ -33,7 +34,7 @@ class CMSPageEditController extends CMSMain
 
     public function getClientConfig()
     {
-        return array_merge(parent::getClientConfig(), [
+        return ArrayLib::array_merge_recursive(parent::getClientConfig(), [
             'form' => [
                 'AddToCampaignForm' => [
                     'schemaUrl' => $this->Link('schema/AddToCampaignForm')