Merge pull request #552 from hailwood/patch-1

Make getMergeFieldsMap protected
2017-08-11 15:19:27 +12:00 · 2017-08-11 15:19:27 +12:00 · c6b30990c8
parent b068bf65bf 704690b798
commit c6b30990c8
1 changed files with 1 additions and 1 deletions
--- a/code/model/UserDefinedForm.php
+++ b/code/model/UserDefinedForm.php
@ -706,7 +706,7 @@ JS
     * @param ArrayList fields
     * @return ArrayData
     */
-    private function getMergeFieldsMap($fields = array())
+    protected function getMergeFieldsMap($fields = array())
    {
        $data = new ArrayData(array());