Merge pull request #9753 from chanunc/master

Fix against PHP warning; Notice: Array to string conversion
civicrm · Feb 1, 2017 · 066122b · 066122b
2 parents 1d8b699 + 94e0152
commit 066122b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/CRM/Contribute/Form/ContributionBase.php b/CRM/Contribute/Form/ContributionBase.php
@@ -633,7 +633,7 @@ public function buildCustom($id, $name, $viewOnly = FALSE, $profileContactType =
 
         //remove common fields only if profile is not configured for onbehalf/honor
         if (!in_array($profileContactType, array('honor', 'onbehalf'))) {
-          $fields = array_diff_assoc($fields, $this->_fields);
+          $fields = array_diff_key($fields, $this->_fields);
         }
 
         CRM_Core_BAO_Address::checkContactSharedAddressFields($fields, $contactID);