From 27b9f49a280a16b5b61992c77c74f8fc3ee659c7 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Sun, 9 Feb 2014 13:40:51 -0800
Subject: [PATCH] Code cleanup

---
 CRM/Admin/Form/Setting/Miscellaneous.php | 2 +-
 api/v3/utils.php                         | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/CRM/Admin/Form/Setting/Miscellaneous.php b/CRM/Admin/Form/Setting/Miscellaneous.php
index 7b54564b73..cca63ec1ab 100644
--- a/CRM/Admin/Form/Setting/Miscellaneous.php
+++ b/CRM/Admin/Form/Setting/Miscellaneous.php
@@ -65,7 +65,7 @@ class CRM_Admin_Form_Setting_Miscellaneous extends CRM_Admin_Form_Setting {
     $domain = new CRM_Core_DAO_Domain;
     $domain->find(TRUE);
     $attribs = $domain->locales || !$validTriggerPermission ?
-      array('disabled' => 'disabled') : NULL;
+      array('disabled' => 'disabled') : array();
 
     $this->assign('validTriggerPermission', $validTriggerPermission);
     $this->addYesNo('logging', ts('Logging'), NULL, NULL, $attribs);
diff --git a/api/v3/utils.php b/api/v3/utils.php
index a4c869bac9..8fdde3e643 100644
--- a/api/v3/utils.php
+++ b/api/v3/utils.php
@@ -78,8 +78,7 @@ function civicrm_api3_verify_one_mandatory($params, $daoName = NULL, $keyoptions
  *
  * @todo see notes on _civicrm_api3_check_required_fields regarding removing $daoName param
  */
-function civicrm_api3_verify_mandatory($params, $daoName = NULL, $keys = array(
-  ), $verifyDAO = TRUE) {
+function civicrm_api3_verify_mandatory($params, $daoName = NULL, $keys = array(), $verifyDAO = TRUE) {
 
   $unmatched = array();
   if ($daoName != NULL && $verifyDAO && empty($params['id'])) {
@@ -1390,8 +1389,7 @@ function _civicrm_api3_generic_replace_base_params($params) {
  *
  * @return array
  */
-function _civicrm_api_get_fields($entity, $unique = FALSE, &$params = array(
-  )) {
+function _civicrm_api_get_fields($entity, $unique = FALSE, &$params = array()) {
   $unsetIfEmpty = array('dataPattern', 'headerPattern', 'default', 'export', 'import');
   $dao = _civicrm_api3_get_DAO($entity);
   if (empty($dao)) {
-- 
2.25.1