Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-02-02-18-36-16

[civicrm-core.git] / CRM / Contribute / Form.php

diff --git a/CRM/Contribute/Form.php b/CRM/Contribute/Form.php
index 1b97fa906b53b09fe579dbeb07b36e803a469ea5..ddc30aa4a99dd523cb83614dba675c072960d58c 100644 (file)
--- a/CRM/Contribute/Form.php
+++ b/CRM/Contribute/Form.php
@@ -23,7 +23,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
@@ -51,7 +51,7 @@ class CRM_Contribute_Form extends CRM_Admin_Form {
 
     if (isset($this->_id)) {
       $params = array('id' => $this->_id);
-      if (!empty( $this->_BAOName)) {
+      if (!empty($this->_BAOName)) {
         $baoName = $this->_BAOName;
         $baoName::retrieve($params, $defaults);
       }
@@ -61,7 +61,7 @@ class CRM_Contribute_Form extends CRM_Admin_Form {
     }
     elseif ($this->_action == CRM_Core_Action::ADD) {
       $condition = " AND is_default = 1";
-      $values = CRM_Core_OptionGroup::values('financial_account_type', false, false, false, $condition);
+      $values = CRM_Core_OptionGroup::values('financial_account_type', FALSE, FALSE, FALSE, $condition);
       $defaults['financial_account_type_id'] = array_keys($values);
       $defaults['is_active'] = 1;