Merge pull request #9854 from adixon/CRM-20040

[civicrm-core.git] / CRM / Grant / BAO / Grant.php

diff --git a/CRM/Grant/BAO/Grant.php b/CRM/Grant/BAO/Grant.php
index a4c30adb8d675454d2c9e2b59f9ac6dc80d1ae41..7a669d599e6b71fd26579a98fd8a0d73fdf4aecb 100644 (file)
--- a/CRM/Grant/BAO/Grant.php
+++ b/CRM/Grant/BAO/Grant.php
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2016                                |
+ | Copyright CiviCRM LLC (c) 2004-2017                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2016
+ * @copyright CiviCRM LLC (c) 2004-2017
  * $Id$
  *
  */
@@ -61,7 +61,7 @@ class CRM_Grant_BAO_Grant extends CRM_Grant_DAO_Grant {
             SELECT status_id, count(id) as status_total
             FROM civicrm_grant  GROUP BY status_id";
 
-    $dao = CRM_Core_DAO::executeQuery($query, CRM_Core_DAO::$_nullArray);
+    $dao = CRM_Core_DAO::executeQuery($query);
 
     $status = array();
     $summary = array();
@@ -353,27 +353,27 @@ class CRM_Grant_BAO_Grant extends CRM_Grant_DAO_Grant {
 
       $grantFields = array(
         'grant_status' => array(
-          'title' => 'Grant Status',
+          'title' => ts('Grant Status'),
           'name' => 'grant_status',
           'data_type' => CRM_Utils_Type::T_STRING,
         ),
         'grant_type' => array(
-          'title' => 'Grant Type',
+          'title' => ts('Grant Type'),
           'name' => 'grant_type',
           'data_type' => CRM_Utils_Type::T_STRING,
         ),
         'grant_money_transfer_date' => array(
-          'title' => 'Grant Money Transfer Date',
+          'title' => ts('Grant Money Transfer Date'),
           'name' => 'grant_money_transfer_date',
           'data_type' => CRM_Utils_Type::T_DATE,
         ),
         'grant_amount_requested' => array(
-          'title' => 'Grant Amount Requested',
+          'title' => ts('Grant Amount Requested'),
           'name' => 'grant_amount_requested',
           'data_type' => CRM_Utils_Type::T_FLOAT,
         ),
         'grant_application_received_date' => array(
-          'title' => 'Grant Application Received Date',
+          'title' => ts('Grant Application Received Date'),
           'name' => 'grant_application_received_date',
           'data_type' => CRM_Utils_Type::T_DATE,
         ),