Merge pull request #8938 from jcharaoui/fix-array-key-exists-null

totten · web-flow · commit a73f00b9a0b0 · 2016-08-26T17:38:33.000-07:00
Fix array_key_exists() PHP warning in Report Forms
diff --git a/CRM/Report/Form.php b/CRM/Report/Form.php
@@ -2090,6 +2090,7 @@ public function alterCustomDataDisplay(&$rows) {
       return;
     }
 
+    $customFields = array();
     $customFieldIds = array();
     foreach ($this->_params['fields'] as $fieldAlias => $value) {
       if ($fieldId = CRM_Core_BAO_CustomField::getKeyID($fieldAlias)) {

Original file line number	Diff line number	Diff line change
`@@ -2090,6 +2090,7 @@ public function alterCustomDataDisplay(&$rows) {`
`2090`	`2090`	`return;`
`2091`	`2091`	`}`
`2092`	`2092`
	`2093`	`+ $customFields = array();`
`2093`	`2094`	`$customFieldIds = array();`
`2094`	`2095`	`foreach ($this->_params['fields'] as $fieldAlias => $value) {`
`2095`	`2096`	`if ($fieldId = CRM_Core_BAO_CustomField::getKeyID($fieldAlias)) {`