From 50172d25f27412bd74a21727c84696e49e44d736 Mon Sep 17 00:00:00 2001
From: eileenmcnaugton <eileen@fuzion.co.nz>
Date: Tue, 8 Sep 2015 09:26:29 +1200
Subject: [PATCH] CRM-17115 fix enotices from qa

---
 CRM/Report/Form.php | 25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/CRM/Report/Form.php b/CRM/Report/Form.php
index 33259ab2bf..19a61892bb 100644
--- a/CRM/Report/Form.php
+++ b/CRM/Report/Form.php
@@ -4186,26 +4186,13 @@ LEFT JOIN civicrm_contact {$field['alias']} ON {$field['alias']}.id = {$this->_a
    */
   public function alterDisplayContactFields(&$row, &$rows, &$rowNum, $baseUrl, $linkText) {
     $entryFound = FALSE;
-    if (array_key_exists('civicrm_contact_prefix_id', $row)) {
-      $prefixes = CRM_Contact_BAO_Contact::buildOptions('prefix_id');
-      if ($value = $row['civicrm_contact_prefix_id']) {
-        $rows[$rowNum]['civicrm_contact_prefix_id'] = $prefixes[$rows[$rowNum]['civicrm_contact_prefix_id']];
-      }
-      $entryFound = TRUE;
-    }
-    if (array_key_exists('civicrm_contact_suffix_id', $row)) {
-      $suffixes = CRM_Contact_BAO_Contact::buildOptions('suffix_id');
-      if ($value = $row['civicrm_contact_suffix_id']) {
-        $rows[$rowNum]['civicrm_contact_suffix_id'] = $suffixes[$rows[$rowNum]['civicrm_contact_suffix_id']];
-      }
-      $entryFound = TRUE;
-    }
-    if (array_key_exists('civicrm_contact_gender_id', $row)) {
-      if (($value = $row['civicrm_contact_gender_id']) != FALSE) {
-        $rows[$rowNum]['civicrm_contact_gender_id'] = CRM_Core_Pseudoconstant::getLabel('CRM_Contact_BAO_Contact', 'gender_id', $rows[$rowNum]['civicrm_contact_gender_id']);
-        $this->addLinkToRow($rows[$rowNum], $baseUrl, $linkText, $value, 'gender_id', 'civicrm_contact', 'Gender');
+    foreach (array('prefix_id', 'suffix_id', 'gender_id') as $fieldName) {
+      if (array_key_exists('civicrm_contact_' . $fieldName, $row)) {
+        if (($value = $row['civicrm_contact_' . $fieldName]) != FALSE) {
+          $rows[$rowNum]['civicrm_contact_' . $fieldName] = CRM_Core_Pseudoconstant::getLabel('CRM_Contact_BAO_Contact', $fieldName, $value);
+        }
+        $entryFound = TRUE;
       }
-      $entryFound = TRUE;
     }
     return $entryFound;
   }
-- 
2.25.1