test break fixes

diff --git a/CRM/Contact/BAO/Query.php b/CRM/Contact/BAO/Query.php
index 5cab9eedff5f10d264cc26c5766acb153e93ccbd..fe19b6b9430d2d42aa1223ac1aff98cdef085779 100644 (file)
--- a/CRM/Contact/BAO/Query.php
+++ b/CRM/Contact/BAO/Query.php
@@ -613,7 +613,8 @@ class CRM_Contact_BAO_Query {
         (substr($name, 0, 12) == 'participant_') ||
         (substr($name, 0, 7) == 'pledge_') ||
         (substr($name, 0, 5) == 'case_') ||
-        (substr($name, 0, 13) == 'contribution_' && strpos($name, 'source') === FALSE) ||
+        (substr($name, 0, 13) == 'contribution_' &&
+          (strpos($name, 'source') !== FALSE || strpos($name, 'recur') !== FALSE)) ||
         (substr($name, 0, 8) == 'payment_')
       ) {
         continue;

diff --git a/tests/phpunit/api/v3/UtilsTest.php b/tests/phpunit/api/v3/UtilsTest.php
index ccf59b074eca0692c6557d1825d51202e9b8b068..a0086acdc09e4abe45499efd268711f92728520e 100644 (file)
--- a/tests/phpunit/api/v3/UtilsTest.php
+++ b/tests/phpunit/api/v3/UtilsTest.php
@@ -259,7 +259,8 @@ class api_v3_UtilsTest extends CiviUnitTestCase {
     );
     $fields = civicrm_api3('Membership', 'getfields', array('action' => 'get'));
     _civicrm_api3_validate_fields('Membership', 'get', $params, $fields['values']);
-    $this->assertEquals('20101220000000', $params['start_date'], 'in line ' . __LINE__);
+    $this->assertEquals('2010-12-20', $params['start_date']);
+    $this->assertEquals('20101220000000', $params['membership_start_date'], 'in line ' . __LINE__);
     $this->assertEquals('', $params['end_date']);
     $this->assertEquals('20101220000000', $params['join_date'], 'join_date not set in line ' . __LINE__);
   }