From 704690b798e26339db2efb88157cf4556d8fbe6a Mon Sep 17 00:00:00 2001
From: Matthew Hailwood <matthew@hailwood.nz>
Date: Wed, 1 Mar 2017 10:33:05 +1300
Subject: [PATCH] Make getMergeFieldsMap protected

Annoying having to copy this method if you want to replace "process" in an extending class so we'll make it a bit looser shall we?
---
 code/model/UserDefinedForm.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/model/UserDefinedForm.php b/code/model/UserDefinedForm.php
index 94ad55e..6e4665e 100755
--- a/code/model/UserDefinedForm.php
+++ b/code/model/UserDefinedForm.php
@@ -838,7 +838,7 @@ JS
      * @param ArrayList fields
      * @return ArrayData
      */
-    private function getMergeFieldsMap($fields = array())
+    protected function getMergeFieldsMap($fields = array())
     {
         $data = new ArrayData(array());