From fc161185126dd7db02beac743fb872ef0b72a762 Mon Sep 17 00:00:00 2001
From: Deepak Srivastava <deepak.srivastava@webaccess.co.in>
Date: Wed, 22 May 2013 18:55:24 +0530
Subject: [PATCH] notice fixes towards CRM-12623
----------------------------------------
* CRM-12623: Create CiviHR Report Template
http://issues.civicrm.org/jira/browse/CRM-12623
---
CRM/Core/OptionValue.php | 2 +-
CRM/Report/Form.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/CRM/Core/OptionValue.php b/CRM/Core/OptionValue.php
index 89f1a72494..27165b1a85 100644
--- a/CRM/Core/OptionValue.php
+++ b/CRM/Core/OptionValue.php
@@ -201,7 +201,7 @@ class CRM_Core_OptionValue {
$oldWeight = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_OptionValue', $optionValueID, 'weight', 'id');
}
$fieldValues = array('option_group_id' => $optionGroupID);
- $params['weight'] = CRM_Utils_Weight::updateOtherWeights('CRM_Core_DAO_OptionValue', $oldWeight, $params['weight'], $fieldValues);
+ $params['weight'] = CRM_Utils_Weight::updateOtherWeights('CRM_Core_DAO_OptionValue', $oldWeight, CRM_Utils_Array::value('weight', $params), $fieldValues);
}
$params['option_group_id'] = $optionGroupID;
diff --git a/CRM/Report/Form.php b/CRM/Report/Form.php
index 361e2bc6fa..325e0595e2 100644
--- a/CRM/Report/Form.php
+++ b/CRM/Report/Form.php
@@ -2755,7 +2755,7 @@ ORDER BY cg.weight, cf.weight";
}
if (!array_key_exists('type', $curFields[$fieldName])) {
- $curFields[$fieldName]['type'] = $curFilters[$fieldName]['type'];
+ $curFields[$fieldName]['type'] = CRM_Utils_Array::value('type', $curFilters[$fieldName], array());
}
if ($addFields) {
--
GitLab