Merge pull request #2391 from colemanw/arrayEmpty

[civicrm-core.git] / CRM / Report / Form / Extended.php

diff --git a/CRM/Report/Form/Extended.php b/CRM/Report/Form/Extended.php
index 86da05d56b5d2d7fc4da3c1cef66c55856f6c974..298c8703c97cb5d28db6797ca7df052775a34ad1 100644 (file)
--- a/CRM/Report/Form/Extended.php
+++ b/CRM/Report/Form/Extended.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.3                                                |
+ | CiviCRM version 4.4                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2013                                |
  +--------------------------------------------------------------------+
@@ -105,7 +105,7 @@ class CRM_Report_Form_Extended extends CRM_Report_Form {
   }
 
   function postProcess() {
-    if (!empty($this->_aclTable) && CRM_Utils_Array::value($this->_aclTable, $this->_aliases)) {
+    if (!empty($this->_aclTable) && !empty($this->_aliases[$this->_aclTable])) {
       $this->buildACLClause($this->_aliases[$this->_aclTable]);
     }
     parent::postProcess();
@@ -206,7 +206,7 @@ class CRM_Report_Form_Extended extends CRM_Report_Form {
     return array(
       'civicrm_price_field_value' =>
       array(
-        'dao' => 'CRM_Price_BAO_FieldValue',
+        'dao' => 'CRM_Price_BAO_PriceFieldValue',
         'fields' => array(
           'price_field_value_label' =>
           array('title' => ts('Price Field Value Label'),
@@ -247,7 +247,7 @@ class CRM_Report_Form_Extended extends CRM_Report_Form {
     return array(
       'civicrm_price_field' =>
       array(
-        'dao' => 'CRM_Price_BAO_Field',
+        'dao' => 'CRM_Price_BAO_PriceField',
         'fields' =>
         array(
           'price_field_label' =>
@@ -1110,7 +1110,7 @@ FROM civicrm_contribution contribution_civireport_direct
 LEFT JOIN civicrm_membership_payment pp ON contribution_civireport_direct.id = pp.contribution_id
 LEFT JOIN civicrm_membership p ON pp.membership_id = p.id
 LEFT JOIN civicrm_line_item line_item_civireport ON (line_item_civireport.line_total > 0 AND line_item_civireport.entity_id = p.id AND line_item_civireport.entity_table = 'civicrm_membership')
-WHERE  line_item_civireport.id IS NOT NULL
+WHERE   line_item_civireport.id IS NOT NULL
 ) as {$this->_aliases['civicrm_line_item']}
   ON {$this->_aliases['civicrm_line_item']}.contid = {$this->_aliases['civicrm_contribution']}.id
 
@@ -1129,7 +1129,7 @@ FROM civicrm_contribution contribution_civireport_direct
 LEFT JOIN civicrm_line_item line_item_civireport
 ON (line_item_civireport.line_total > 0 AND line_item_civireport.entity_id = contribution_civireport_direct.id AND line_item_civireport.entity_table = 'civicrm_contribution')
 
-WHERE  line_item_civireport.id IS NOT NULL
+WHERE   line_item_civireport.id IS NOT NULL
 
 UNION
 
@@ -1138,7 +1138,7 @@ FROM civicrm_contribution contribution_civireport_direct
 LEFT JOIN civicrm_membership_payment pp ON contribution_civireport_direct.id = pp.contribution_id
 LEFT JOIN civicrm_membership p ON pp.membership_id = p.id
 LEFT JOIN civicrm_line_item line_item_civireport ON (line_item_civireport.line_total > 0 AND line_item_civireport.entity_id = p.id AND line_item_civireport.entity_table = 'civicrm_membership')
-WHERE  line_item_civireport.id IS NOT NULL
+WHERE   line_item_civireport.id IS NOT NULL
 ) as {$this->_aliases['civicrm_line_item']}
   ON {$this->_aliases['civicrm_line_item']}.contid = {$this->_aliases['civicrm_contribution']}.id
   ";
@@ -1215,9 +1215,7 @@ WHERE     line_item_civireport.id IS NOT NULL
   function alterCountryID($value, &$row, $selectedfield, $criteriaFieldName) {
     $url = CRM_Utils_System::url(CRM_Utils_System::currentPath(), "reset=1&force=1&{$criteriaFieldName}_op=in&{$criteriaFieldName}_value={$value}", $this->_absoluteUrl);
     $row[$selectedfield . '_link'] = $url;
-    $row[$selectedfield . '_hover'] = ts("%1 for this country.", array(
-        1 => $value,
-      ));
+    $row[$selectedfield . '_hover'] = ts("%1 for this country.", array(1 => $value));
     $countries =  CRM_Core_PseudoConstant::country($value, FALSE);
     if(!is_array($countries)){
       return $countries;
@@ -1227,9 +1225,7 @@ WHERE     line_item_civireport.id IS NOT NULL
   function alterCountyID($value, &$row,$selectedfield, $criteriaFieldName) {
     $url = CRM_Utils_System::url(CRM_Utils_System::currentPath(), "reset=1&force=1&{$criteriaFieldName}_op=in&{$criteriaFieldName}_value={$value}", $this->_absoluteUrl);
     $row[$selectedfield . '_link'] = $url;
-    $row[$selectedfield . '_hover'] = ts("%1 for this county.", array(
-        1 => $value,
-      ));
+    $row[$selectedfield . '_hover'] = ts("%1 for this county.", array(1 => $value));
     $counties = CRM_Core_PseudoConstant::county($value, FALSE);
     if(!is_array($counties)){
       return $counties;
@@ -1239,9 +1235,7 @@ WHERE     line_item_civireport.id IS NOT NULL
   function alterStateProvinceID($value, &$row, $selectedfield, $criteriaFieldName) {
     $url = CRM_Utils_System::url(CRM_Utils_System::currentPath(), "reset=1&force=1&{$criteriaFieldName}_op=in&{$criteriaFieldName}_value={$value}", $this->_absoluteUrl);
     $row[$selectedfield . '_link'] = $url;
-    $row[$selectedfield . '_hover'] = ts("%1 for this state.", array(
-        1 => $value,
-      ));
+    $row[$selectedfield . '_hover'] = ts("%1 for this state.", array(1 => $value));
 
     $states =  CRM_Core_PseudoConstant::stateProvince($value, FALSE);
     if(!is_array($states)){