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 8bc77c7c6bffa23ca8e90512b8ca161f300fd0c5..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' =>