CRM-18472: Warning fix on search builder and notice fix

diff --git a/CRM/Pledge/BAO/Pledge.php b/CRM/Pledge/BAO/Pledge.php
index 8687d908b922e6d93d835b9d0329d4f46e00a77c..2ec83ff2359406026403915d388e92df5201f745 100644 (file)
--- 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 c9a485a653fd2f27d2d0e3c9a15b1234cae2823f..4e9859ce79471f3647d9b4ed7fb9fc706b23c2d2 100644 (file)
--- 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.