From dbab3426af1f1ed3ee4b52340f7f585c2aafd44b Mon Sep 17 00:00:00 2001
From: Deepak Srivastava <deepak.srivastava@webaccess.co.in>
Date: Tue, 4 Jun 2013 21:09:10 +0530
Subject: [PATCH] php 5.4 notice fixes
---
CRM/Report/Form.php | 2 +-
CRM/Report/Form/Contribute/Summary.php | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/CRM/Report/Form.php b/CRM/Report/Form.php
index 51a3da3833..af96eab52e 100644
--- a/CRM/Report/Form.php
+++ b/CRM/Report/Form.php
@@ -199,6 +199,7 @@ class CRM_Report_Form extends CRM_Core_Form {
protected $_sections = NULL;
protected $_autoIncludeIndexedFieldsAsOrderBys = 0;
protected $_absoluteUrl = FALSE;
+ protected $_grandFlag = FALSE;
/**
* To what frequency group-by a date column
@@ -1578,7 +1579,6 @@ WHERE cg.extends IN ('" . implode("','", $this->_customGroupExtends) . "') AND
}
$lastRow = array_pop($rows);
- $this->_grandFlag = FALSE;
foreach ($this->_columnHeaders as $fld => $val) {
if (!in_array($fld, $this->_statFields)) {
if (!$this->_grandFlag) {
diff --git a/CRM/Report/Form/Contribute/Summary.php b/CRM/Report/Form/Contribute/Summary.php
index 9ac733ee67..f98a706571 100644
--- a/CRM/Report/Form/Contribute/Summary.php
+++ b/CRM/Report/Form/Contribute/Summary.php
@@ -224,7 +224,6 @@ class CRM_Report_Form_Contribute_Summary extends CRM_Report_Form {
'operatorType' => CRM_Report_Form::OP_MULTISELECT,
'options' => $this->activeCampaigns,
);
- $this->_columns['civicrm_contribution']['grouping']['campaign_id'] = 'contri-fields';
$this->_columns['civicrm_contribution']['group_bys']['campaign_id'] = array('title' => ts('Campaign'));
}
--
GitLab