From b3460c238299386f536093f33c3886bb9a710846 Mon Sep 17 00:00:00 2001 From: jitendrapurohit Date: Wed, 27 Apr 2016 15:29:27 +0530 Subject: [PATCH] CRM-18472: Warning fix on search builder and notice fix --- CRM/Pledge/BAO/Pledge.php | 2 +- CRM/Price/BAO/PriceSet.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CRM/Pledge/BAO/Pledge.php b/CRM/Pledge/BAO/Pledge.php index 8687d908b9..2ec83ff235 100644 --- a/CRM/Pledge/BAO/Pledge.php +++ b/CRM/Pledge/BAO/Pledge.php @@ -738,7 +738,7 @@ GROUP BY currency * @return array * array of exportable Fields */ - public static function exportableFields($checkPermission) { + public static function exportableFields($checkPermission = TRUE) { if (!self::$_exportableFields) { if (!self::$_exportableFields) { self::$_exportableFields = array(); diff --git a/CRM/Price/BAO/PriceSet.php b/CRM/Price/BAO/PriceSet.php index c9a485a653..4e9859ce79 100644 --- a/CRM/Price/BAO/PriceSet.php +++ b/CRM/Price/BAO/PriceSet.php @@ -1068,7 +1068,7 @@ WHERE id = %1"; foreach ($form->_priceSet['fields'] as &$field) { if (array_key_exists('options', $field) && is_array($field['options'])) { foreach ($field['options'] as $option) { - if ($option['membership_type_id']) { + if (!empty($option['membership_type_id'])) { if (in_array($option['membership_type_id'], $autoRenewMembershipTypes)) { $form->_priceSet['auto_renew_membership_field'] = $field['id']; // Only one field can offer auto_renew memberships, so break here. -- 2.25.1