warning fixes

diff --git a/CRM/Report/Form/Contact/CurrentEmployer.php b/CRM/Report/Form/Contact/CurrentEmployer.php
index 394a0c26f807615f967ffd1ea6b678a297cfdc25..b0160edc4d92c8ad82debfa4f215acf1e549c930 100644 (file)
--- a/CRM/Report/Form/Contact/CurrentEmployer.php
+++ b/CRM/Report/Form/Contact/CurrentEmployer.php
@@ -115,7 +115,7 @@ class CRM_Report_Form_Contact_CurrentEmployer extends CRM_Report_Form {
           'sort_name' => array('title' => ts('Employee Name')),
           'source' => array(
             'title' => ts('Contact Source'),
-            'type'      => CRM_Utils_Type::T_STRING,
+            'type' => CRM_Utils_Type::T_STRING,
           ),
           'id' => array(
             'title' => ts('Contact ID'),

diff --git a/CRM/Report/Form/Contribute/Detail.php b/CRM/Report/Form/Contribute/Detail.php
index f4413d26ad91d69bb6e24dcb2aa4cbc9e4207d72..72f848fc516c6c56dbb48660229715284dd63037 100644 (file)
--- a/CRM/Report/Form/Contribute/Detail.php
+++ b/CRM/Report/Form/Contribute/Detail.php
@@ -45,7 +45,7 @@ class CRM_Report_Form_Contribute_Detail extends CRM_Report_Form {
   protected $_customGroupExtends = array(
     'Contact',
     'Individual',
-    'Contribution'
+    'Contribution',
   );
 
   /**

diff --git a/CRM/Report/Form/Contribute/History.php b/CRM/Report/Form/Contribute/History.php
index 292b9732195142e9d632c8471baab2c03c1fc177..119cbeeca2e00d1406f38e1bbc154d99ac5cf2cd 100644 (file)
--- a/CRM/Report/Form/Contribute/History.php
+++ b/CRM/Report/Form/Contribute/History.php
@@ -43,7 +43,7 @@ class CRM_Report_Form_Contribute_History extends CRM_Report_Form {
   protected $_customGroupExtends = array(
     'Contact',
     'Individual',
-    'Contribution'
+    'Contribution',
   );
 
   protected $_referenceYear = array(

diff --git a/CRM/Report/Form/Contribute/Lybunt.php b/CRM/Report/Form/Contribute/Lybunt.php
index c5c223e02abd55e5a6d05d14c97582e5dc3d265e..8cac2d775f9eb3a028ccf092a1008e4039c97edf 100644 (file)
--- a/CRM/Report/Form/Contribute/Lybunt.php
+++ b/CRM/Report/Form/Contribute/Lybunt.php
@@ -43,7 +43,7 @@ class CRM_Report_Form_Contribute_Lybunt extends CRM_Report_Form {
   protected $_customGroupExtends = array(
     'Contact',
     'Individual',
-    'Contribution'
+    'Contribution',
   );
 
   public $_drilldownReport = array('contribute/detail' => 'Link to Detail Report');

diff --git a/CRM/Report/Form/Contribute/SoftCredit.php b/CRM/Report/Form/Contribute/SoftCredit.php
index 6ed97b2efaa064655dcfb9f7d0e3a140533c03f3..87bdce7bbe29a97bec39f5de4a31d4faf7bd98dd 100644 (file)
--- a/CRM/Report/Form/Contribute/SoftCredit.php
+++ b/CRM/Report/Form/Contribute/SoftCredit.php
@@ -47,7 +47,7 @@ class CRM_Report_Form_Contribute_SoftCredit extends CRM_Report_Form {
   protected $_customGroupExtends = array(
     'Contact',
     'Individual',
-    'Contribution'
+    'Contribution',
   );
 
   public $_drilldownReport = array('contribute/detail' => 'Link to Detail Report');

diff --git a/CRM/Report/Form/Contribute/Sybunt.php b/CRM/Report/Form/Contribute/Sybunt.php
index 17edcabaaeee641352be3e6f876ff650c27fb8e0..e214895f7bb30302d3266abf6695b7a344e3278e 100644 (file)
--- a/CRM/Report/Form/Contribute/Sybunt.php
+++ b/CRM/Report/Form/Contribute/Sybunt.php
@@ -43,7 +43,7 @@ class CRM_Report_Form_Contribute_Sybunt extends CRM_Report_Form {
   protected $_customGroupExtends = array(
     'Contact',
     'Individual',
-    'Contribution'
+    'Contribution',
   );
 
   public $_drilldownReport = array('contribute/detail' => 'Link to Detail Report');

diff --git a/CRM/Report/Form/Contribute/TopDonor.php b/CRM/Report/Form/Contribute/TopDonor.php
index a100afd5ce78daae752aef205cf5e0972487ca9c..1f2a4c0dc94533640f7c1232952968cce702d3ab 100644 (file)
--- a/CRM/Report/Form/Contribute/TopDonor.php
+++ b/CRM/Report/Form/Contribute/TopDonor.php
@@ -38,7 +38,7 @@ class CRM_Report_Form_Contribute_TopDonor extends CRM_Report_Form {
   protected $_customGroupExtends = array(
     'Contact',
     'Individual',
-    'Contribution'
+    'Contribution',
   );
 
   public $_drilldownReport = array('contribute/detail' => 'Link to Detail Report');
@@ -491,23 +491,23 @@ ORDER BY civicrm_contribution_total_amount_sum DESC
         }
         $entryFound = $this->alterDisplayAddressFields($row, $rows, $rowNum, 'contribute/detail', 'List all contribution(s)') ? TRUE : $entryFound;
 
-      //handle gender
-      if (array_key_exists('civicrm_contact_gender_id', $row)) {
-        if ($value = $row['civicrm_contact_gender_id']) {
-          $gender = CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'gender_id');
-          $rows[$rowNum]['civicrm_contact_gender_id'] = $gender[$value];
+        //handle gender
+        if (array_key_exists('civicrm_contact_gender_id', $row)) {
+          if ($value = $row['civicrm_contact_gender_id']) {
+            $gender = CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'gender_id');
+            $rows[$rowNum]['civicrm_contact_gender_id'] = $gender[$value];
+          }
+          $entryFound = TRUE;
         }
-        $entryFound = TRUE;
-      }
 
-      // display birthday in the configured custom format
-      if (array_key_exists('civicrm_contact_birth_date', $row)) {
-        $birthDate = $row['civicrm_contact_birth_date'];
-        if ($birthDate) {
-          $rows[$rowNum]['civicrm_contact_birth_date'] = CRM_Utils_Date::customFormat($birthDate, '%Y%m%d');
+        // display birthday in the configured custom format
+        if (array_key_exists('civicrm_contact_birth_date', $row)) {
+          $birthDate = $row['civicrm_contact_birth_date'];
+          if ($birthDate) {
+            $rows[$rowNum]['civicrm_contact_birth_date'] = CRM_Utils_Date::customFormat($birthDate, '%Y%m%d');
+          }
+          $entryFound = TRUE;
         }
-        $entryFound = TRUE;
-      }
 
         // skip looking further in rows, if first row itself doesn't
         // have the column we need