Merge pull request #14822 from eileenmcnaughton/export
authorcolemanw <coleman@civicrm.org>
Mon, 15 Jul 2019 18:37:24 +0000 (14:37 -0400)
committerGitHub <noreply@github.com>
Mon, 15 Jul 2019 18:37:24 +0000 (14:37 -0400)
[REF] [Export] remove another confusing parameter

172 files changed:
CRM/ACL/BAO/ACL.php
CRM/ACL/DAO/ACL.php
CRM/ACL/DAO/Cache.php
CRM/ACL/DAO/EntityRole.php
CRM/ACL/Form/ACL.php
CRM/Activity/DAO/Activity.php
CRM/Activity/DAO/ActivityContact.php
CRM/Admin/Form/Setting/Localization.php
CRM/Batch/DAO/Batch.php
CRM/Batch/DAO/EntityBatch.php
CRM/Campaign/DAO/Campaign.php
CRM/Campaign/DAO/CampaignGroup.php
CRM/Campaign/DAO/Survey.php
CRM/Case/DAO/Case.php
CRM/Case/DAO/CaseActivity.php
CRM/Case/DAO/CaseContact.php
CRM/Case/DAO/CaseType.php
CRM/Contact/BAO/Contact.php
CRM/Contact/DAO/ACLContactCache.php
CRM/Contact/DAO/Contact.php
CRM/Contact/DAO/ContactType.php
CRM/Contact/DAO/DashboardContact.php
CRM/Contact/DAO/Group.php
CRM/Contact/DAO/GroupContact.php
CRM/Contact/DAO/GroupContactCache.php
CRM/Contact/DAO/GroupNesting.php
CRM/Contact/DAO/GroupOrganization.php
CRM/Contact/DAO/Relationship.php
CRM/Contact/DAO/RelationshipType.php
CRM/Contact/DAO/SavedSearch.php
CRM/Contact/DAO/SubscriptionHistory.php
CRM/Contribute/BAO/Query.php
CRM/Contribute/DAO/Contribution.php
CRM/Contribute/DAO/ContributionPage.php
CRM/Contribute/DAO/ContributionProduct.php
CRM/Contribute/DAO/ContributionRecur.php
CRM/Contribute/DAO/ContributionSoft.php
CRM/Contribute/DAO/Premium.php
CRM/Contribute/DAO/PremiumsProduct.php
CRM/Contribute/DAO/Product.php
CRM/Contribute/DAO/Widget.php
CRM/Core/BAO/Cache/Psr16.php
CRM/Core/BAO/CustomField.php
CRM/Core/BAO/CustomGroup.php
CRM/Core/CodeGen/Specification.php
CRM/Core/DAO/ActionLog.php
CRM/Core/DAO/ActionMapping.php
CRM/Core/DAO/ActionSchedule.php
CRM/Core/DAO/Address.php
CRM/Core/DAO/AddressFormat.php
CRM/Core/DAO/Cache.php
CRM/Core/DAO/Component.php
CRM/Core/DAO/Country.php
CRM/Core/DAO/County.php
CRM/Core/DAO/CustomField.php
CRM/Core/DAO/CustomGroup.php
CRM/Core/DAO/Dashboard.php
CRM/Core/DAO/Discount.php
CRM/Core/DAO/Domain.php
CRM/Core/DAO/Email.php
CRM/Core/DAO/EntityFile.php
CRM/Core/DAO/EntityTag.php
CRM/Core/DAO/Extension.php
CRM/Core/DAO/File.php
CRM/Core/DAO/IM.php
CRM/Core/DAO/Job.php
CRM/Core/DAO/JobLog.php
CRM/Core/DAO/LocBlock.php
CRM/Core/DAO/LocationType.php
CRM/Core/DAO/Log.php
CRM/Core/DAO/MailSettings.php
CRM/Core/DAO/Managed.php
CRM/Core/DAO/Mapping.php
CRM/Core/DAO/MappingField.php
CRM/Core/DAO/Menu.php
CRM/Core/DAO/MessageTemplate.php
CRM/Core/DAO/Navigation.php
CRM/Core/DAO/Note.php
CRM/Core/DAO/OpenID.php
CRM/Core/DAO/OptionGroup.php
CRM/Core/DAO/OptionValue.php
CRM/Core/DAO/Persistent.php
CRM/Core/DAO/Phone.php
CRM/Core/DAO/PreferencesDate.php
CRM/Core/DAO/PrevNextCache.php
CRM/Core/DAO/PrintLabel.php
CRM/Core/DAO/RecurringEntity.php
CRM/Core/DAO/Setting.php
CRM/Core/DAO/StateProvince.php
CRM/Core/DAO/StatusPreference.php
CRM/Core/DAO/SystemLog.php
CRM/Core/DAO/Tag.php
CRM/Core/DAO/Timezone.php
CRM/Core/DAO/UFField.php
CRM/Core/DAO/UFGroup.php
CRM/Core/DAO/UFJoin.php
CRM/Core/DAO/UFMatch.php
CRM/Core/DAO/Website.php
CRM/Core/DAO/WordReplacement.php
CRM/Core/DAO/Worldregion.php
CRM/Custom/Form/ChangeFieldType.php
CRM/Custom/Form/Field.php
CRM/Custom/Form/Group.php
CRM/Cxn/DAO/Cxn.php
CRM/Dedupe/DAO/Exception.php
CRM/Dedupe/DAO/Rule.php
CRM/Dedupe/DAO/RuleGroup.php
CRM/Event/Cart/DAO/Cart.php
CRM/Event/Cart/DAO/EventInCart.php
CRM/Event/DAO/Event.php
CRM/Event/DAO/Participant.php
CRM/Event/DAO/ParticipantPayment.php
CRM/Event/DAO/ParticipantStatusType.php
CRM/Financial/DAO/Currency.php
CRM/Financial/DAO/EntityFinancialAccount.php
CRM/Financial/DAO/EntityFinancialTrxn.php
CRM/Financial/DAO/FinancialAccount.php
CRM/Financial/DAO/FinancialItem.php
CRM/Financial/DAO/FinancialTrxn.php
CRM/Financial/DAO/FinancialType.php
CRM/Financial/DAO/PaymentProcessor.php
CRM/Financial/DAO/PaymentProcessorType.php
CRM/Financial/DAO/PaymentToken.php
CRM/Friend/DAO/Friend.php
CRM/Grant/DAO/Grant.php
CRM/Mailing/DAO/BouncePattern.php
CRM/Mailing/DAO/BounceType.php
CRM/Mailing/DAO/Mailing.php
CRM/Mailing/DAO/MailingAB.php
CRM/Mailing/DAO/MailingComponent.php
CRM/Mailing/DAO/MailingGroup.php
CRM/Mailing/DAO/MailingJob.php
CRM/Mailing/DAO/Recipients.php
CRM/Mailing/DAO/Spool.php
CRM/Mailing/DAO/TrackableURL.php
CRM/Mailing/Event/DAO/Bounce.php
CRM/Mailing/Event/DAO/Confirm.php
CRM/Mailing/Event/DAO/Delivered.php
CRM/Mailing/Event/DAO/Forward.php
CRM/Mailing/Event/DAO/Opened.php
CRM/Mailing/Event/DAO/Queue.php
CRM/Mailing/Event/DAO/Reply.php
CRM/Mailing/Event/DAO/Subscribe.php
CRM/Mailing/Event/DAO/TrackableURLOpen.php
CRM/Mailing/Event/DAO/Unsubscribe.php
CRM/Mailing/Selector/Browse.php
CRM/Member/DAO/Membership.php
CRM/Member/DAO/MembershipBlock.php
CRM/Member/DAO/MembershipLog.php
CRM/Member/DAO/MembershipPayment.php
CRM/Member/DAO/MembershipStatus.php
CRM/Member/DAO/MembershipType.php
CRM/PCP/DAO/PCP.php
CRM/PCP/DAO/PCPBlock.php
CRM/Pledge/DAO/Pledge.php
CRM/Pledge/DAO/PledgeBlock.php
CRM/Pledge/DAO/PledgePayment.php
CRM/Price/DAO/LineItem.php
CRM/Price/DAO/PriceField.php
CRM/Price/DAO/PriceFieldValue.php
CRM/Price/DAO/PriceSet.php
CRM/Price/DAO/PriceSetEntity.php
CRM/Queue/DAO/QueueItem.php
CRM/Report/DAO/ReportInstance.php
CRM/SMS/DAO/Provider.php
CRM/Utils/System.php
Civi/Core/Container.php
sql/GenerateData.php
sql/GenerateReportData.php
tests/phpunit/CRM/Contribute/Form/SearchTest.php
xml/schema/Contribute/ContributionRecur.xml
xml/templates/dao.tpl

index abf87247bbe8e073e7512bfe08bbc48d0c6be8ff..71050fffbcf4b039c0978f1e751c85984f66d746 100644 (file)
@@ -687,8 +687,9 @@ SELECT $acl.*
    *   true if we found and updated the object, else false
    */
   public static function setIsActive($id, $is_active) {
-    // note this also resets any ACL cache
-    CRM_Core_BAO_Cache::deleteGroup('contact fields');
+    Civi::cache('fields')->flush();
+    // reset ACL and system caches.
+    CRM_Core_BAO_Cache::resetCaches();
 
     return CRM_Core_DAO::setFieldValue('CRM_ACL_DAO_ACL', $id, 'is_active', $is_active);
   }
index d887be06bdffd509521fbe435890b17a64645338..d5a62e863ada3b137a0d243460562d8cfa33adfa 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/ACL/ACL.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:f415db79c66c2e8a95f88c886cec4266)
+ * (GenCodeChecksum:5dae38d9d5e128062b634a01ccfad2b0)
  */
 
 /**
index 52058d84a69f2c4867ee8e20fa5f8d12b188040d..34a3e7360b56f9727e26ea3315146edf437e8daf 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/ACL/Cache.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:9e80148349c86b214e0303642dfc47e7)
+ * (GenCodeChecksum:6180a43e0d4bd8f2008286be6683d0ba)
  */
 
 /**
index 4fe8594781b1a43e143a71fc8a82141e08429d2a..ae09968341daaabf059bd05908e34ac190af4117 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/ACL/EntityRole.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:cdb4379a1345c2f92f1f354aff42c446)
+ * (GenCodeChecksum:0dc853871318ba5645e0f8f12aac58f6)
  */
 
 /**
index b119f7503aedd1435100bd42ade6a72267597037..7f9419721437886a8499cb6b5bac45598e488b0d 100644 (file)
@@ -254,7 +254,9 @@ class CRM_ACL_Form_ACL extends CRM_Admin_Form {
    */
   public function postProcess() {
     // note this also resets any ACL cache
-    CRM_Core_BAO_Cache::deleteGroup('contact fields');
+    Civi::cache('fields')->flush();
+    // reset ACL and system caches.
+    CRM_Core_BAO_Cache::resetCaches();
 
     if ($this->_action & CRM_Core_Action::DELETE) {
       CRM_ACL_BAO_ACL::del($this->_id);
index 21468db91bc4392ee3e557a6cabe9be44e8e5312..d9353fa848acddb2af425089d6ee9a650500bbac 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Activity/Activity.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:b0a38b2fb168879a7b8097f17a313375)
+ * (GenCodeChecksum:fa6ffb0aaff92c8a515aff74919c7ad3)
  */
 
 /**
index f82cd4c90f178c84f15782996b7f7040784355ab..290148d0e4b6a228d42fa4d50ce6cac27e802f80 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Activity/ActivityContact.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:6500dec56f6917871572cd1296a52bc9)
+ * (GenCodeChecksum:ba1318187b6445db9a639c8476eb683e)
  */
 
 /**
index e5c52cd7c335b47b021150de0d2c3391c4bb94ca..2e85c5924a39e05541a30690eac403174d4b9e79 100644 (file)
@@ -184,7 +184,7 @@ class CRM_Admin_Form_Setting_Localization extends CRM_Admin_Form_Setting {
 
     //cache contact fields retaining localized titles
     //though we changed localization, so reseting cache.
-    CRM_Core_BAO_Cache::deleteGroup('contact fields');
+    Civi::cache('fields')->flush();
 
     //CRM-8559, cache navigation do not respect locale if it is changed, so reseting cache.
     Civi::cache('navigation')->flush();
index 3ccd9c869eb3722bd433b2e5825dd8931e0f7428..221cbef7af3cbff8f4f5e2644c7aa4ecef745a9a 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Batch/Batch.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:bb7740fd38ae1c433a5e643de9d1b041)
+ * (GenCodeChecksum:d0986aaf599e8243517d4a2912a67f94)
  */
 
 /**
index d07e6e1aab47b7e9414120b92158021bb4b727f3..b491a4107895f85d7063cf7872a4e46cda0a2f96 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Batch/EntityBatch.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:2d08c3008d6c7a05698fdbe02ad48921)
+ * (GenCodeChecksum:cf1316450cf80689399a7f55bb3b4261)
  */
 
 /**
index f8f815a130129fcfbd9ec7e7aaf5531453005e07..c71ec811f730f2af864f51ca0fe765ccc101f3ed 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Campaign/Campaign.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:2e624d3c874f1720634bf3954f77f460)
+ * (GenCodeChecksum:ab19aa73d01b529988c178673fc38d58)
  */
 
 /**
index 6f94488d13d1b60a5a3ff5524246fd75796d9ced..fbb03b47abf5436abd7035486466bfab59ec3308 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Campaign/CampaignGroup.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:c67604933af69d768aa2f989e082bc11)
+ * (GenCodeChecksum:a31197c38f4456b239242d274d38a148)
  */
 
 /**
index 3bc1a8e71ed95d14528874bdfbbb7ce1d7b49ae2..47678b9fa353d5f3e966cb0ead9f60a78af3ad88 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Campaign/Survey.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:23a4ac88478af204885d170f42c5990b)
+ * (GenCodeChecksum:66d74656d01b2d56d4d4861203ef2fdd)
  */
 
 /**
index 32f599953d1e6bb343b534f6a3f1661e60238b20..9246c0935baf62768a7f9691d7d13b75cd27d9f1 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Case/Case.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:ef55a2e5b12047af86439542927b6800)
+ * (GenCodeChecksum:c5896e4b577b32d8a2c62d3cba65119d)
  */
 
 /**
index d19ca14a36ca171adfdb05481b81833c765bb0a5..e608b2d6f156eedba89d0b7b46e6082c51b02082 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Case/CaseActivity.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:5697d114b740fb610d38577657c1dbfd)
+ * (GenCodeChecksum:57e9c421eca2efb62ee2eed396c19cd6)
  */
 
 /**
index f1f5a9866b603a45692c7fac841fd25556392f58..e90afbe50c61ccad6985aea0a65bce70402d996e 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Case/CaseContact.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:c74aa90d8f31629354041ed18de9a468)
+ * (GenCodeChecksum:57c510f7c1c0eb55f8452035a5ecc472)
  */
 
 /**
index 84a3300b3ac8cf7cfbb6c915dd2fcfe8f0f0a8df..0fa3479e7795d3a588f7e91919f8a5a963490aab 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Case/CaseType.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:27419fd4de448a468cd726a85b097d19)
+ * (GenCodeChecksum:a1c00e097da3683e7bb131894bf1aa6d)
  */
 
 /**
index bd56e2127e43b6622aa65e71e49c99f2b4d75a94..fce78b7affacef83d9395f3a698c39bfcb61872a 100644 (file)
@@ -1351,12 +1351,7 @@ WHERE     civicrm_contact.id = " . CRM_Utils_Type::escape($id, 'Integer');
     $cacheKeyString .= $checkPermission ? '_1' : '_0';
     $cacheKeyString .= '_' . CRM_Core_Config::domainID() . '_';
 
-    $fields = CRM_Utils_Array::value($cacheKeyString, self::$_importableFields);
-
-    if (!$fields) {
-      // check if we can retrieve from database cache
-      $fields = CRM_Core_BAO_Cache::getItem('contact fields', $cacheKeyString);
-    }
+    $fields = CRM_Utils_Array::value($cacheKeyString, self::$_importableFields) ?: Civi::cache('fields')->get($cacheKeyString);
 
     if (!$fields) {
       $fields = CRM_Contact_DAO_Contact::import();
@@ -1494,7 +1489,7 @@ WHERE     civicrm_contact.id = " . CRM_Utils_Type::escape($id, 'Integer');
       //Sorting fields in alphabetical order(CRM-1507)
       $fields = CRM_Utils_Array::crmArraySortByField($fields, 'title');
 
-      CRM_Core_BAO_Cache::setItem($fields, 'contact fields', $cacheKeyString);
+      Civi::cache('fields')->set($cacheKeyString, $fields);
     }
 
     self::$_importableFields[$cacheKeyString] = $fields;
@@ -1552,7 +1547,7 @@ WHERE     civicrm_contact.id = " . CRM_Utils_Type::escape($id, 'Integer');
       }
 
       // check if we can retrieve from database cache
-      $fields = CRM_Core_BAO_Cache::getItem('contact fields', $cacheKeyString);
+      $fields = Civi::cache('fields')->get($cacheKeyString);
 
       if (!$fields) {
         $fields = CRM_Contact_DAO_Contact::export();
@@ -1742,7 +1737,7 @@ WHERE     civicrm_contact.id = " . CRM_Utils_Type::escape($id, 'Integer');
           }
         }
 
-        CRM_Core_BAO_Cache::setItem($fields, 'contact fields', $cacheKeyString);
+        Civi::cache('fields')->set($cacheKeyString, $fields);
       }
       self::$_exportableFields[$cacheKeyString] = $fields;
     }
index b62b6e482e4e9e5f4562ca4d2a760126c484bfc0..3cb1fe173238604c28384ef76ed9e15dc035397c 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contact/ACLContactCache.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:de29bdc03ca3c85509bde973de137240)
+ * (GenCodeChecksum:ae8316157b30548661674486dac78c39)
  */
 
 /**
index 3b662f4815894e9f819a748a7848fd244cab1e91..5bc2b38a3b2a2ec5b9aeee63d4d97e0019bbe476 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contact/Contact.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:881cb541dcc67f4520c7cf44d65d047d)
+ * (GenCodeChecksum:bd37bd31a0ac8ba4fd5f411fddef080b)
  */
 
 /**
index 78e7b6680c21b5e9446bd9bd4329cccd987a07ee..b6db4bf8561298e346da191891b6a714bdb0b2a1 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contact/ContactType.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:4b0fb96273ba6a1e4e767dfa25453688)
+ * (GenCodeChecksum:d96dfa7e002831e18c602df130626dbb)
  */
 
 /**
index 1684bbefb6e824ea13053327ad5164af7c41a75e..e9456cec9e11f770850f041e5f2eb4abdcac086b 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contact/DashboardContact.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:a1e9fb0cd3adf30a24d357fc8d1635b4)
+ * (GenCodeChecksum:c1c463648cc70fd1f1d023aefe4eed76)
  */
 
 /**
index 20d066e94f6595ed5d0c8f67a808cb6c4814d744..8e7ce46ae84166c2d04ac7a787af308b72d2235e 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contact/Group.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:1d60242104df0a4f536e0f317ad70eef)
+ * (GenCodeChecksum:fbbb4f322f030f3dab859acf2b47276a)
  */
 
 /**
index 5e651f25c66b356790a67fc395c0d0519c6006a3..aa20c459b680a2d487c697140441547fee344220 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contact/GroupContact.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:68d2a6dddcaeb556fb8f688e8c035f65)
+ * (GenCodeChecksum:2c54dc849ac565362f938a8145f5f0fb)
  */
 
 /**
index 5157e2cf534780cd914ae6ba073813e11d430c88..8c8c09f29ede0e3650a90e1bc1c76e07eef342eb 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contact/GroupContactCache.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:76b51ba6400cb7eabe4278e34a733df6)
+ * (GenCodeChecksum:9cfbab3bf59940215b561454a69a9656)
  */
 
 /**
index ff40b3bd70b6a2a6d0aaf18f60d50ad4133bc011..71cae5d79f0b598923c18f5e2e45e244216aeac7 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contact/GroupNesting.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:3f80175bbbca60e85ffc680bc191a74e)
+ * (GenCodeChecksum:11d9e300c63cb3bae2af0077456cce0b)
  */
 
 /**
index 2b81492759177a2329284837855c25402f8e3ad6..a6491b4f9f34d5aa7b0bcbe2c1b722aea45694d8 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contact/GroupOrganization.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:fb8f634bd98fa9467d94c41c11b4b83d)
+ * (GenCodeChecksum:c921c7d49f23f8d8afa07773da5b5da3)
  */
 
 /**
index 1f3778e22b82cbdc89004ed4f874c81bc105b11e..2849aead67fad577c8e2c9a27ff2868756c02ce9 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contact/Relationship.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:79b9fa57db6e675d1d366f69afca215d)
+ * (GenCodeChecksum:089830b385d7fd32704aa11332e37254)
  */
 
 /**
index c5a9278a672ce6774ce0c73486b55df15b28987b..a4509a7b8bbb1a5fe1ac6dcbebf6eca7e84faf3e 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contact/RelationshipType.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:4f2d363d1dc33b8b4dcbf82b72da2c79)
+ * (GenCodeChecksum:6442ad1ae7850007792bbbfa0226cb4a)
  */
 
 /**
index e9cf758ade8aefe3e41b9a0138e39a0aa74251bb..cd29f674953b5435b2f20ef2f39c20133d9836ba 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contact/SavedSearch.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:0b26e371ea12eb1b8a948c28ba923d32)
+ * (GenCodeChecksum:88f2f400312a1ae04a4cfde200d64c8d)
  */
 
 /**
index bf79a94348e21a6d31ac73045be6465ac27966df..805e02ca3a38bf39fd6f68798830404e30d16de5 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contact/SubscriptionHistory.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:8d39eedce498de37290f0702f7a84773)
+ * (GenCodeChecksum:161f6ed400e9511cd2e5751941634cc4)
  */
 
 /**
index 95959ab9f89cc144800b94b6c069e67309f47384..e5c285e2da61528422c5a669b1d54231fda85bad 100644 (file)
@@ -48,10 +48,15 @@ class CRM_Contribute_BAO_Query extends CRM_Core_BAO_Query {
    */
   public static function getFields($checkPermission = TRUE) {
     if (!isset(\Civi::$statics[__CLASS__]) || !isset(\Civi::$statics[__CLASS__]['fields']) || !isset(\Civi::$statics[__CLASS__]['fields']['contribution'])) {
-      // Adding fields with some care as those without unique names could clobber others.
-      // Refer to CRM_Contribute_Form_SearchTest for existing tests ... and to add more!
-      $testedRecurFields = array_fill_keys(['contribution_recur_trxn_id', 'contribution_recur_processor_id', 'contribution_recur_payment_processor_id'], 1);
-      $recurFields = array_intersect_key(CRM_Contribute_DAO_ContributionRecur::fields(), $testedRecurFields);
+      $recurFields = CRM_Contribute_DAO_ContributionRecur::fields();
+      foreach ($recurFields as $fieldKey => $field) {
+        // We can only safely add in those with unique names as those without could clobber others.
+        // The array is keyed by unique names so if it doesn't match the key there is no unique name & we unset
+        // Refer to CRM_Contribute_Form_SearchTest for existing tests ... and to add more!
+        if ($field['name'] === $fieldKey) {
+          unset($recurFields[$fieldKey]);
+        }
+      }
       $fields = array_merge($recurFields, CRM_Contribute_BAO_Contribution::exportableFields($checkPermission));
       CRM_Contribute_BAO_Contribution::appendPseudoConstantsToFields($fields);
       unset($fields['contribution_contact_id']);
@@ -179,6 +184,17 @@ class CRM_Contribute_BAO_Query extends CRM_Core_BAO_Query {
       $qillName = array_search($name, $fieldAliases);
     }
     $pseudoExtraParam = [];
+    $fieldName = str_replace(['_high', '_low'], '', $name);
+    $fieldSpec = CRM_Utils_Array::value($fieldName, $fields, []);
+    $tableName = CRM_Utils_Array::value('table_name', $fieldSpec, 'civicrm_contribution');
+    $dataType = CRM_Utils_Type::typeToString(CRM_Utils_Array::value('type', $fieldSpec));
+    if ($dataType === 'Timestamp' || $dataType === 'Date') {
+      $query->_tables['civicrm_contribution'] = $query->_whereTables['civicrm_contribution'] = 1;
+      $query->dateQueryBuilder($values,
+        $tableName, $fieldName, $fieldSpec['name'], $fieldSpec['title']
+      );
+      return;
+    }
 
     switch ($name) {
       case 'contribution_date':
@@ -230,17 +246,6 @@ class CRM_Contribute_BAO_Query extends CRM_Core_BAO_Query {
         $query->_tables['civicrm_contribution'] = $query->_whereTables['civicrm_contribution'] = 1;
         return;
 
-      case 'contribution_cancel_date':
-      case 'contribution_cancel_date_low':
-      case 'contribution_cancel_date_low_time':
-      case 'contribution_cancel_date_high':
-      case 'contribution_cancel_date_high_time':
-        // process to / from date
-        $query->dateQueryBuilder($values,
-          'civicrm_contribution', 'contribution_cancel_date', 'cancel_date', ts('Cancelled / Refunded Date')
-        );
-        return;
-
       case 'financial_type_id':
       case 'invoice_id':
       case 'invoice_number':
@@ -256,7 +261,6 @@ class CRM_Contribute_BAO_Query extends CRM_Core_BAO_Query {
       case 'contribution_check_number':
       case 'contribution_contact_id':
       case (strpos($name, '_amount') !== FALSE):
-      case (strpos($name, '_date') !== FALSE && $name != 'contribution_fulfilled_date'):
       case 'contribution_campaign_id':
 
         $fieldNamesNotToStripContributionFrom = [
@@ -516,7 +520,7 @@ class CRM_Contribute_BAO_Query extends CRM_Core_BAO_Query {
         $query->_qill[$grouping][] = "$whereTable[title] $op $quoteValue";
         list($tableName) = explode('.', $whereTable['where'], 2);
         $query->_tables[$tableName] = $query->_whereTables[$tableName] = 1;
-        if ($tableName == 'civicrm_contribution_product') {
+        if ($tableName === 'civicrm_contribution_product') {
           $query->_tables['civicrm_product'] = $query->_whereTables['civicrm_product'] = 1;
           $query->_tables['civicrm_contribution'] = $query->_whereTables['civicrm_contribution'] = 1;
         }
index 2284edf5472516b8725bb6795efafc2c74e31a21..26ca0b9b93c47679de856984b92b0f5da57ae3dc 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contribute/Contribution.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:a38f41244c16c766116e56b8df3d4c5e)
+ * (GenCodeChecksum:0972c177daa2ee48c98658f62c0f8ade)
  */
 
 /**
index 3f731e4f95b022c7979e1edee98af3efc7e444af..c4b5382c4a59d6236d1986fcf0b239afc886a5ca 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contribute/ContributionPage.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:476aca3020ef286e4ba5208fa231eb58)
+ * (GenCodeChecksum:a0dc506faaceaf3a644d020cd5b0676b)
  */
 
 /**
index b23eca995a5f519d05b143cd5cd77c4177bce22a..5d21e66a1b3b9328d104231c610224d6b3821a04 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contribute/ContributionProduct.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:ecc5bc5ad7a739764dbf41e27897d03b)
+ * (GenCodeChecksum:ff8ff52e402d36b2d488ec5cda68ff12)
  */
 
 /**
index ca9594294c0cd5cb167f835c39530c30adb88f61..0bb99f3a9f36367d00f1d45f1ddb941a48fd44b2 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contribute/ContributionRecur.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:1c5a083e992b74571e2a7852de0cdee0)
+ * (GenCodeChecksum:95610d5dfc95017698041a9e814a7cda)
  */
 
 /**
@@ -383,7 +383,7 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO {
             'type' => 'Text',
           ],
         ],
-        'start_date' => [
+        'contribution_recur_start_date' => [
           'name' => 'start_date',
           'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME,
           'title' => ts('Start Date'),
@@ -394,12 +394,13 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO {
           'entity' => 'ContributionRecur',
           'bao' => 'CRM_Contribute_BAO_ContributionRecur',
           'localizable' => 0,
+          'unique_title' => ts('Recurring Contribution Start Date'),
           'html' => [
             'type' => 'Select Date',
             'formatType' => 'activityDateTime',
           ],
         ],
-        'create_date' => [
+        'contribution_recur_create_date' => [
           'name' => 'create_date',
           'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME,
           'title' => ts('Created Date'),
@@ -410,12 +411,13 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO {
           'entity' => 'ContributionRecur',
           'bao' => 'CRM_Contribute_BAO_ContributionRecur',
           'localizable' => 0,
+          'unique_title' => ts('Recurring Contribution Create Date'),
           'html' => [
             'type' => 'Select Date',
             'formatType' => 'activityDateTime',
           ],
         ],
-        'modified_date' => [
+        'contribution_recur_modified_date' => [
           'name' => 'modified_date',
           'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME,
           'title' => ts('Modified Date'),
@@ -425,12 +427,13 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO {
           'entity' => 'ContributionRecur',
           'bao' => 'CRM_Contribute_BAO_ContributionRecur',
           'localizable' => 0,
+          'unique_title' => ts('Recurring Contribution Modified Date'),
           'html' => [
             'type' => 'Select Date',
             'formatType' => 'activityDateTime',
           ],
         ],
-        'cancel_date' => [
+        'contribution_recur_cancel_date' => [
           'name' => 'cancel_date',
           'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME,
           'title' => ts('Cancel Date'),
@@ -440,6 +443,7 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO {
           'entity' => 'ContributionRecur',
           'bao' => 'CRM_Contribute_BAO_ContributionRecur',
           'localizable' => 0,
+          'unique_title' => ts('Recurring Contribution Cancel Date'),
           'html' => [
             'type' => 'Select Date',
             'formatType' => 'activityDate',
@@ -455,11 +459,12 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO {
           'entity' => 'ContributionRecur',
           'bao' => 'CRM_Contribute_BAO_ContributionRecur',
           'localizable' => 0,
+          'unique_title' => ts('Recurring Contribution Cancel Reason'),
           'html' => [
             'type' => 'Text',
           ],
         ],
-        'end_date' => [
+        'contribution_recur_end_date' => [
           'name' => 'end_date',
           'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME,
           'title' => ts('Recurring Contribution End Date'),
@@ -469,6 +474,7 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO {
           'entity' => 'ContributionRecur',
           'bao' => 'CRM_Contribute_BAO_ContributionRecur',
           'localizable' => 0,
+          'unique_title' => ts('Recurring Contribution End Date'),
           'html' => [
             'type' => 'Select Date',
             'formatType' => 'activityDate',
@@ -586,7 +592,7 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO {
             'type' => 'Text',
           ],
         ],
-        'next_sched_contribution_date' => [
+        'contribution_recur_next_sched_contribution_date' => [
           'name' => 'next_sched_contribution_date',
           'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME,
           'title' => ts('Next Scheduled Contribution Date'),
@@ -596,6 +602,7 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO {
           'entity' => 'ContributionRecur',
           'bao' => 'CRM_Contribute_BAO_ContributionRecur',
           'localizable' => 0,
+          'unique_title' => ts('Next Scheduled Recurring Contribution'),
           'html' => [
             'type' => 'Select Date',
             'formatType' => 'activityDate',
@@ -616,7 +623,7 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO {
             'type' => 'Text',
           ],
         ],
-        'failure_retry_date' => [
+        'contribution_recur_failure_retry_date' => [
           'name' => 'failure_retry_date',
           'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME,
           'title' => ts('Retry Failed Attempt Date'),
@@ -626,6 +633,7 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO {
           'entity' => 'ContributionRecur',
           'bao' => 'CRM_Contribute_BAO_ContributionRecur',
           'localizable' => 0,
+          'unique_title' => ts('Failed Recurring Contribution Retry Date'),
           'html' => [
             'type' => 'Select Date',
             'formatType' => 'activityDate',
index ec9594b5d81e5c97e1334218ebfea0dc21613126..2ae9dd65b5a3356058eab5135a9f1ee42805bed2 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contribute/ContributionSoft.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:99263c64e6bfa08bf725daf83d6aedcf)
+ * (GenCodeChecksum:2872ea7ea6a2581d868e805574b9ae9f)
  */
 
 /**
index 282a55e2b0c5decda73015271706a5677bd71ea5..2e69754026728c76bc635b2096a9bfc7e4d76958 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contribute/Premium.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:10cc32dfc45ec3853caebce2d5b78018)
+ * (GenCodeChecksum:58eb4aacd3084c54c8c6847bdc7c0b0e)
  */
 
 /**
index ed9ae181665231f81f2bc7db252060b44a72677d..134ac9f52cf34d00295dfa13c66ab21939264a48 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contribute/PremiumsProduct.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:1e7a968a1d7448211b025026d2c716d3)
+ * (GenCodeChecksum:c165125a7d8f92c40a68bdad3715d28d)
  */
 
 /**
index a85ae650c35b3d1250e6f1252ff17403ca956542..1e59b596ba4f11ecb5839f0afaa390f258f94f87 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contribute/Product.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:bbb44dd82a92de8b8fc92d095c0651f6)
+ * (GenCodeChecksum:6db129966023efff6007413d264f7e37)
  */
 
 /**
index a90456f89131ae0bb2a8b45ed860ece51bc6e3b7..964ff7ed65b7bdeb84723957934bb3c91191553b 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contribute/Widget.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:11c8bb223fe748c9d19d1a103dd404a2)
+ * (GenCodeChecksum:a1f9bf066d659e32e32cd324aeb7a286)
  */
 
 /**
index 34aa47cd8916d94ec16c422f065d3ba15dd1fe51..b4f724195791575de269d3f135ec1dfd14955140 100644 (file)
@@ -181,10 +181,6 @@ class CRM_Core_BAO_Cache_Psr16 {
    */
   public static function getLegacyGroups() {
     $groups = [
-      // Core
-      'contact fields',
-      'custom data',
-
       // Universe
 
       // be.chiro.civi.atomfeeds
index f6dce2967db19f30d7bed20bfbd6489b8c822273..6b704a2d85eda1aa62bca8661fe41d2d9788452e 100644 (file)
@@ -401,7 +401,7 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField {
       }
 
       // check if we can retrieve from database cache
-      $fields = CRM_Core_BAO_Cache::getItem('contact fields', "custom importableFields $cacheKey");
+      $fields = Civi::Cache('fields')->get("custom importableFields $cacheKey");
 
       if ($fields === NULL) {
         $cfTable = self::getTableName();
@@ -547,10 +547,7 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField {
 
         }
 
-        CRM_Core_BAO_Cache::setItem($fields,
-          'contact fields',
-          "custom importableFields $cacheKey"
-        );
+        Civi::cache('fields')->set("custom importableFields $cacheKey", $fields);
       }
       self::$_importFields[$cacheKey] = $fields;
     }
index b74b6637bd080596fc65304a1c61b18214f139a0..3f92e2696b4d098919a3a59110051a468e2f4e39 100644 (file)
@@ -259,7 +259,9 @@ class CRM_Core_BAO_CustomGroup extends CRM_Core_DAO_CustomGroup {
    */
   public static function setIsActive($id, $is_active) {
     // reset the cache
-    CRM_Core_BAO_Cache::deleteGroup('contact fields');
+    Civi::cache('fields')->flush();
+    // reset ACL and system caches.
+    CRM_Core_BAO_Cache::resetCaches();
 
     if (!$is_active) {
       CRM_Core_BAO_UFField::setUFFieldStatus($id, $is_active);
@@ -1818,7 +1820,7 @@ SELECT IF( EXISTS(SELECT name FROM civicrm_contact_type WHERE name like %1), 1,
 
     // fetch submitted custom field values later use to set as a default values
     if ($qfKey) {
-      $submittedValues = CRM_Core_BAO_Cache::getItem('custom data', $qfKey);
+      $submittedValues = Civi::cache('customData')->get($qfKey);
     }
 
     foreach ($groupTree as $key => $value) {
@@ -1877,7 +1879,7 @@ SELECT IF( EXISTS(SELECT name FROM civicrm_contact_type WHERE name like %1), 1,
       if (count($formValues)) {
         $qf = $form->get('qfKey');
         $form->assign('qfKey', $qf);
-        CRM_Core_BAO_Cache::setItem($formValues, 'custom data', $qf);
+        Civi::cache('customData')->set($qf, $formValues);
       }
 
       // hack for field type File
index 8e518894d2ba8c550264ca15197983a323fbcae0..e0bfedca500e3e5283cdfbd44b2be3d0bd187857 100644 (file)
@@ -368,6 +368,7 @@ class CRM_Core_CodeGen_Specification {
     $field['headerPattern'] = $this->value('headerPattern', $fieldXML);
     $field['dataPattern'] = $this->value('dataPattern', $fieldXML);
     $field['uniqueName'] = $this->value('uniqueName', $fieldXML);
+    $field['uniqueTitle'] = $this->value('uniqueTitle', $fieldXML);
     $field['serialize'] = $this->value('serialize', $fieldXML);
     $field['html'] = $this->value('html', $fieldXML);
     if (isset($fieldXML->permission)) {
index 6737bd08b9d65a0b53c25a9b69f9842b6796f606..3ff764944167a5b0694acaa836a692374a87b377 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/ActionLog.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:8222f77d3172efea46b87c6924caca5a)
+ * (GenCodeChecksum:b3c1b04d503947b5ec42a671bb4f0f6d)
  */
 
 /**
@@ -92,7 +92,7 @@ class CRM_Core_DAO_ActionLog extends CRM_Core_DAO {
   /**
    * Stores the date from the entity which triggered this reminder action (e.g. membership.end_date for most membership renewal reminders)
    *
-   * @var date
+   * @var datetime
    */
   public $reference_date;
 
@@ -237,7 +237,7 @@ class CRM_Core_DAO_ActionLog extends CRM_Core_DAO {
         ],
         'reference_date' => [
           'name' => 'reference_date',
-          'type' => CRM_Utils_Type::T_DATE,
+          'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME,
           'title' => ts('Reference Date'),
           'description' => ts('Stores the date from the entity which triggered this reminder action (e.g. membership.end_date for most membership renewal reminders)'),
           'where' => 'civicrm_action_log.reference_date',
index bfc83ced0219d597cc965ed8aa317739df3af35f..52a979925a13d7858075d81e837fc162e0b4e84e 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/ActionMapping.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:97df1735e5aca0e6f5d44639d54ae2e9)
+ * (GenCodeChecksum:4642b2b6da658a34c8dda7c46a93e059)
  */
 
 /**
index dba72de1150adc7f8c55a0a6674d34546758e1eb..f067bbb7c8ee3a00b3af4d41fa0cbed1114eb0b2 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/ActionSchedule.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:102f7e04ce302d5c27944002ddc9a7e4)
+ * (GenCodeChecksum:aee88e50a306c0ae2d2aa373ec6c0af5)
  */
 
 /**
index 8317a6a3abd484cfe7a2fc59dfabca6833e27795..b1e00a83dc990f2f2ca9999fc90fa379bd93f214 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Address.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:0bdffc6881044732530669419c70abf8)
+ * (GenCodeChecksum:e9acc7bc70fb2860407a7d4afe12c725)
  */
 
 /**
index de8520b8ce68abc67b1eb98b96f66f157cf701e3..bcc4c39ee8c042bbde2db4d5f1b8bf5b2a93a3bc 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/AddressFormat.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:7fc341ff6e09eedcfdd201337a1f525a)
+ * (GenCodeChecksum:5cf75b7bfd496cdc343cb8a9766d546c)
  */
 
 /**
index 5c68f255fa9a098781d49b924b351184aabfcdeb..01536dda8ed0c391031bdfc4ce548220362d65b9 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Cache.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:45ad2336491944c63577ccf7c92cb3a1)
+ * (GenCodeChecksum:97df4edaa4829ea30a151dbb95ff754d)
  */
 
 /**
index d6b17a7f79f9bbc2c8dd5511e55a144e35364e1c..85f54c132a98e964be6ff84c78814dd830cd2cbe 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Component.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:ee0bd8a1777473537b84b92163d7271b)
+ * (GenCodeChecksum:4f8734bbe3e7935ef6943a95a9bbdf28)
  */
 
 /**
index adf66bb8d842bc108a827bc26b06eb3745c519a2..834924a08f2b6fac6d202e802389c828fb600ed2 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Country.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:7479471ae701d767241aea412fae5024)
+ * (GenCodeChecksum:31c11db045e03911b14a7661d5e8eb12)
  */
 
 /**
index 69853165767dbf641edf1f0c8a5dfe990845a703..9cf00443683f195ec38d42e42a193aa96cf6e361 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/County.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:3a4393198768dfdf5115b4cac511d225)
+ * (GenCodeChecksum:4ba037c52adafa1cf164bc0a3dca2102)
  */
 
 /**
index 972923f326c970205e88c3f110019315076dc6c5..0375038beb9dd9969fdc31dafa062f7a2abc4b83 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/CustomField.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:2b60ad1539ff2829d131e5b25c1c0c56)
+ * (GenCodeChecksum:0b9f63d0d81091b921012b627182f11b)
  */
 
 /**
index 0c57ff05fb0ded28c9cad843158b2ad14c1043d1..b30d7a44e56a14a05a00c659330d0700c706edbc 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/CustomGroup.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:e4103701823c6d2ba240e404fbefbea8)
+ * (GenCodeChecksum:711e3216e2d56bb62d276bb12b606631)
  */
 
 /**
index c0239c42704dcd71bf948eee5cbee7db49fc6aa6..026937454c374d971e8aa6aeaefafe0fac900362 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Dashboard.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:5b7465862bef69918ea63893442f3b9f)
+ * (GenCodeChecksum:2b085baa3414de05ee5c52a4d7d4f81f)
  */
 
 /**
index 5bf27a0e0f828a8e0e4f8caf2852e22a81debed2..01aa705e6ba1f2382dc0f8f5d359021e959f615e 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Discount.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:52242814cd1a9a62887775cac86c997d)
+ * (GenCodeChecksum:71bcd9deb96abf18da4c7c7769b6a2dd)
  */
 
 /**
index d816f9962704632029571f764a4e791e0a758d5b..fa0c7e87ec8037aa47a72a49a4ee5574af0cb6b9 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Domain.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:6319fa49fc8028ac8c0467e07843eab4)
+ * (GenCodeChecksum:a5a1c028e1412c00cd141f50e566799a)
  */
 
 /**
index b305a8eace840365420f4289cd309e74aef552da..8d96724c0cbcb791548eef7116938c7d50d420ba 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Email.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:31a4028aeb68cd445f890635d1cb7989)
+ * (GenCodeChecksum:7f8d7665fad5c2691c46de7cff8d9149)
  */
 
 /**
index a31b7ae3da6ca8a6b83eaa0bdffa428a268a4685..9bd9473fa9dbff435cab574643eaf2f22ac248a5 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/EntityFile.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:29535e630a2b0126ea96c998cee79332)
+ * (GenCodeChecksum:0ee94b59f5506957ac9bbfbc9d9533c2)
  */
 
 /**
index dd8ded639fd10b51562537bb3df21b867558a719..c1a4c8f943ff8c9e1b24e44672ed5be7ecaceab0 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/EntityTag.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:df3b278f0f356ee3e148605b8b05fa1a)
+ * (GenCodeChecksum:16be4e438f52797d8001b5cbe508c615)
  */
 
 /**
index 86d42298c9c5afe0aa1c29f2cafdceaf71ecf0e2..31b0bb6da9a7b3891e6e45bf049b381612f0d0a1 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Extension.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:3bfb8f235237e4e59499a8303488a046)
+ * (GenCodeChecksum:3c88066844dbbf70b8ee5593eafe65a4)
  */
 
 /**
index c893c81d1a1cebce1ec4dc92623d0afa6b488c4f..a782275afae5339f3db26e234394b78e0205a738 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/File.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:85766eaf78c18044c8e9a6cb485ea117)
+ * (GenCodeChecksum:1ecf5010cac38b5778d7b448b50e7c01)
  */
 
 /**
index dccac7b49b9e0bd2c5cf9e29725e2a2dec7c4a57..7366b908487ede2f568f015dafb459a8c07504b2 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/IM.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:77c810f15f9a1a849bc8ec0af13c649c)
+ * (GenCodeChecksum:cbd52493a36bc7a76440673085467442)
  */
 
 /**
index 6625fa2574115ca6a9da2c24dc058190bc2c5fdc..4a712613488c74071c7c983257031f75392e66fc 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Job.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:a3f0b5ea127818a0f275d56af569eb1b)
+ * (GenCodeChecksum:143980edb0346c065249ee860efe6b41)
  */
 
 /**
index 00531bbd4bfd4213af1bb67139bc6f816bb2bc3a..c1812a6a1a8b4369c110f193d078a6a423bd6c0d 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/JobLog.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:b860ad46594114d854eb1d2fc37e24d1)
+ * (GenCodeChecksum:2bcfc373a7ce0958aea907823720c3c0)
  */
 
 /**
index 0a1a4be726b5477ab04f3fd5b6e0028d28b49fef..d55b65eecd5d4ff8417cb932189b2bccf86205e8 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/LocBlock.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:35011d111ee9dcccc7ab60f48880b6c8)
+ * (GenCodeChecksum:b3cd6cc4298a1df379876cc9c96a4a6b)
  */
 
 /**
index 305e0763b0da4fb9da18a9750a3a630e2c8ebb98..d157c00c21882a671bd1c8511fbc1f4a56860774 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/LocationType.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:a77b2a2dbc2f53a177867ce469704e8d)
+ * (GenCodeChecksum:c3560b71c6b732aaa7febb2567fc1b9c)
  */
 
 /**
index f114b8cc7fe44f0d181af7c8b84321828638ff0d..a0eeafc35a07b29878dfcbe0ef4fbf461ac29e98 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Log.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:4831d3f4833c533032a5f562da1130d8)
+ * (GenCodeChecksum:f7870f1117022484520fe4ef9c015edc)
  */
 
 /**
index a6b6b834ddeaedd3066167b6f4ab0dc530913129..1e6874ebcdfd324faec9d54220214392c3432c56 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/MailSettings.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:483283fce07ef3bebe93af487bd250fc)
+ * (GenCodeChecksum:55eb307722a559ed1b6413a38520d635)
  */
 
 /**
index 45009de133cbe47967eb48b518424ef6df838489..6b7c02636b1b28c978efc14ded9acb3368b6ab92 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Managed.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:0a3426b03618a0a253555cc5a36879d1)
+ * (GenCodeChecksum:0a67162f8af5911b1a6a0f5a03a1b329)
  */
 
 /**
index 84e6234c7052334cd5e3112e96cfa65929d9dd89..9de2b93fc9b406ad201ef5dfac908dcccc5a2c3c 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Mapping.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:af46f571b67dd7d13fe399df24780ed0)
+ * (GenCodeChecksum:3014bcc2b0a9647bad0431f586015208)
  */
 
 /**
index 571f5941dbba06e34d3b8a67a979669da2ea5c07..e9038951abca77c80fbcae95707b01b884f04b24 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/MappingField.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:91eb77fb56523f90c6640c1f61732f3a)
+ * (GenCodeChecksum:686d35f36c7a1c577403930d0ec4dcd1)
  */
 
 /**
index 45d6dab55e19c69893b8ddfa780b2d02e076d4cc..4238d8423621efb10d905f8c91e527d341de902f 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Menu.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:19bdd29c98ad52486377dc77170324c6)
+ * (GenCodeChecksum:42fee92ca199cddbfabfac15b1f3d641)
  */
 
 /**
index 39c04a727fb1cfeea1cc495fe4c37a47dd41d79e..01f9c20b98f773f3a31eb6bcf252177cb4cbe015 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/MessageTemplate.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:c940d61105caa25d6e3ccc4aee660f62)
+ * (GenCodeChecksum:cd30af196b1fc606a1fdccc6d7cfb096)
  */
 
 /**
index 16e227b64e3d7bb1959c6e765fccafdb84c72607..db39ba46468b6280adbbcdd31522cfd1707482d3 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Navigation.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:a28573fd104aa9d86d59ef2ecf89de65)
+ * (GenCodeChecksum:ab8ed383a2b4fe3120d6ea52b18b4e6d)
  */
 
 /**
index 0c8e270cf15539acb2a2ae961aa692e85692e40b..9a57d0a2912bedfe395d709e37e19dd46e2b0c53 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Note.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:4809780ce0ff76ab175d5a8e338063e1)
+ * (GenCodeChecksum:e1249165b22b38a9aee6bd558181ef9d)
  */
 
 /**
index 52014b7fa08d9c159c8e83f1207a9379716a27cb..8a640ea9cc877115e6b98b6579aa07558d67d946 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/OpenID.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:4e19fb6ba4dd25d91a724e28f3520de5)
+ * (GenCodeChecksum:6d4dbdfba0d15a3cdaeb82395ad9b8fc)
  */
 
 /**
index a3d07c2bde90573912d3f17464a409d45dc327d2..ce782bc903bcabb76b452c2467da42571fa643e5 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/OptionGroup.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:15efcffb2511a210d1d612ed1b75e794)
+ * (GenCodeChecksum:a2caf8a64fc70eef9478a1d879ab6784)
  */
 
 /**
index f98c38b2bfd1b2699e8604d5bd367896154da6bb..2ffbfc8a0fc1dea868c4af13c6cf1ef7e8b22c0f 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/OptionValue.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:c23dc115f67f29dd89f33504f3521dbf)
+ * (GenCodeChecksum:156637c23fd657e633b36dc8d410d4ab)
  */
 
 /**
index 6b2661dcd0d0c22a08ef4c30790010575f3fc0b9..294f8e4a84808e1f46ba42ce966c283aa54e0e26 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Persistent.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:3058ae9acc0aeaed4fd2783130822ad5)
+ * (GenCodeChecksum:c9b58928620036a95073810c50bfc911)
  */
 
 /**
index e204d3b3f54286c378cae1f2eef508d89846ba70..ea7a1b69edcbb24c7149bf0a295a8faf7835adf5 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Phone.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:0534130e8e98264b63217e03811d6fce)
+ * (GenCodeChecksum:a6e9de26d34f355e2365c6d4336f734f)
  */
 
 /**
index d0124645e5c97b693cb98dbca7bdc1eee3bd3d40..1166769b48396daf16359075234e4794a549ad1d 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/PreferencesDate.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:714e30a9fca325cee6f343d8d3795558)
+ * (GenCodeChecksum:e24b6513a0604a340a896973ce8d2db2)
  */
 
 /**
index 5e0d62a6ddff67506edae74172dc9e2825a3d76c..5e78fbc8bcc25e5314e867cc9e4ad2295baceb76 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/PrevNextCache.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:a7da8d1ee42e2d8fb5e5c1908ea0ba42)
+ * (GenCodeChecksum:ddd681f365e2e377c23188cf3563c522)
  */
 
 /**
index 6ba14b1e324d4da412f4c28bee88cc757ca84bf8..ed0669e771e6f4eba442a5950cfa9f05d14a0a85 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/PrintLabel.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:d17db2be65263186b2b4974afe67cff2)
+ * (GenCodeChecksum:dff1181c7ca564844b6fed3b5eb2e37e)
  */
 
 /**
index 9fad6c8240cb4948f957460f0d5013ca880a8ea2..63d0c321e8f2eee785112d84beb5b9c1e457432c 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/RecurringEntity.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:75a6072b6cdbce96d00f5e08e160d038)
+ * (GenCodeChecksum:1f197a5848ca641233a99582e055dfb2)
  */
 
 /**
index 6f1be9bfd17d09ce639594bd0e352ef030d3f49d..8b730862729f5177fd9c4be3b761d3003184bb2a 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Setting.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:bfd7ba95e46874ca5fb1d30ab43949f6)
+ * (GenCodeChecksum:9fa60718e4fb92cc6b3e7f9563671b00)
  */
 
 /**
index 9cc7565717245bd4f8d3cddd0292902d614b1e5d..3e1c7a7a887bb2a5a50823afdafde28f3c665742 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/StateProvince.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:37b637b11e8eba970e40de0b20c5083a)
+ * (GenCodeChecksum:f7cd096f67c28ef937992bb61ba60544)
  */
 
 /**
index 721b5e56b91686bcbf8d94f46b7a69114d09988d..3e2bf54ec09cf4e9452b99b01a2ba22eb5d30b73 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/StatusPreference.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:9a60c9ad936d80034142b5eda6ea1789)
+ * (GenCodeChecksum:bb8e5ce5e19462083928dc256fe1ebf2)
  */
 
 /**
index b2e95c358d332508904deeb04d99b32ab953c9e6..8294b84afa43f852ec57abf08cf1f2b366c77430 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/SystemLog.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:efe1ac6318085ebd0529f41d394c693f)
+ * (GenCodeChecksum:f74efcf0420fc093c103adf67384fd4e)
  */
 
 /**
index 3e365698db8acf5c8ccbda23bc967eea5b278191..ddf825998eaaa9b959293d4db2e6a5e735556f41 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Tag.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:0f07d0631c95bf8c7405a4dd61e7694a)
+ * (GenCodeChecksum:9f26fdcff51afe66519e1c06518dccca)
  */
 
 /**
index a688d9c82024786e6c953f67f4d3f944d2008959..649fcdc021eb93e6a70ceed3b045542c1316078b 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Timezone.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:8a3cd87d8bc1150a732876fa093fc370)
+ * (GenCodeChecksum:23841252d8f5bba890c26b1b7c21ab9a)
  */
 
 /**
index 1773c9f32f125487887ec8160ebc5e4ae6f0077a..c716b6b9e304cb8c9dcb4aa435f987887d1ffe72 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/UFField.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:b46a1d1d1ff00165a23db2776df9e678)
+ * (GenCodeChecksum:100fb17dc7c4289eab137e5d7dc4e71c)
  */
 
 /**
index 0a1c5b72e0140511774f831c6c83d24da0e1f5c0..efe2c87041f1eb2af4bf8ee169939ebb0361b90e 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/UFGroup.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:6725768569ed10f4aba92aaca9a2339f)
+ * (GenCodeChecksum:a146a779e1515bd1edbcd00682c0439a)
  */
 
 /**
index 8f3589a09b81802698f616ea522df30a1e2b328b..13c623c07847d8b0d6ec7cb6d02488b91c840a3f 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/UFJoin.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:5cf4b4cb3d7d0a1769ad81e458007844)
+ * (GenCodeChecksum:89f24a136166b937d33c10856bbdbcde)
  */
 
 /**
index 0066c7080e295113bd31dfa099e3d169ea068433..ad1d78267220cfa5b97847a443f7cc7504e43436 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/UFMatch.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:647c57bc3c8e3ddb2cc71842ae71f43a)
+ * (GenCodeChecksum:1e97a23a30709e3dccfe0cb1952e71b4)
  */
 
 /**
index c73eb2040d1c0b61856f954fbd980cac7a95ef1d..cbe6bade77a57ae51bc51530d3494d2f131fbe46 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Website.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:4ab7ed5d71178e5706dd4ae767b94442)
+ * (GenCodeChecksum:7647474e15e7b7f66a4c57a64303e68d)
  */
 
 /**
index 54071564001a1c7e5c18c1184468e6b1aedfbab0..a413208bed69fd70c906913372baef8f18180fc1 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/WordReplacement.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:acca77263288fe75fc59483f036e21e0)
+ * (GenCodeChecksum:f423838740b39ae0935ac1282d9c5734)
  */
 
 /**
index 9782972aedee6d4fd8d4c35ca9a5aa16f08a9f2d..d4e81af03513bc2f0b8c1432542c7697ba9da02e 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Worldregion.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:13bc78085a61efbbcc04fd4d7a27450e)
+ * (GenCodeChecksum:d0738f13dd1c212ec0af5fc031a9c32f)
  */
 
 /**
index 7e89f123826ba8a7b825b61174a445b68b1f4f77..06ff652e35b6e1c3d28261a566b04d78295af754 100644 (file)
@@ -187,7 +187,9 @@ class CRM_Custom_Form_ChangeFieldType extends CRM_Core_Form {
     $customField->save();
 
     // Reset cache for custom fields
-    CRM_Core_BAO_Cache::deleteGroup('contact fields');
+    Civi::cache('fields')->flush();
+    // reset ACL and system caches.
+    CRM_Core_BAO_Cache::resetCaches();
 
     CRM_Core_Session::setStatus(ts('Input type of custom field \'%1\' has been successfully changed to \'%2\'.',
       [1 => $this->_values['label'], 2 => $dstHtmlType]
index 14d407950af546e1d6f4c901e80c03d174ae51a9..3ca131b873bf01c54387e13dc85196a60509b70c 100644 (file)
@@ -1019,7 +1019,7 @@ SELECT id
     $this->_id = $customField->id;
 
     // reset the cache
-    CRM_Core_BAO_Cache::deleteGroup('contact fields');
+    Civi::cache('fields')->flush();
 
     $msg = '<p>' . ts("Custom field '%1' has been saved.", [1 => $customField->label]) . '</p>';
 
index d57e422557da2aea290b1fa943b0b3b47556e794..5da4dd727f00c7cc2f011913611523843cdd98c4 100644 (file)
@@ -457,7 +457,9 @@ class CRM_Custom_Form_Group extends CRM_Core_Form {
     $group = CRM_Core_BAO_CustomGroup::create($params);
 
     // reset the cache
-    CRM_Core_BAO_Cache::deleteGroup('contact fields');
+    Civi::cache('fields')->flush();
+    // reset ACL and system caches.
+    CRM_Core_BAO_Cache::resetCaches();
 
     if ($this->_action & CRM_Core_Action::UPDATE) {
       CRM_Core_Session::setStatus(ts('Your custom field set \'%1 \' has been saved.', [1 => $group->title]), ts('Saved'), 'success');
index 342a01222afb44dbaf598f5fd31ff57069367e55..5486079f7a242a6441ff4754cb41d4e4241c1b7d 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Cxn/Cxn.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:519cb483cf9da3dceb979002d5f5d344)
+ * (GenCodeChecksum:f61b008692885b08cacabc147424ba52)
  */
 
 /**
index 3d4743273ab1db8dc6a3943c334139356bb12c49..5f05c27981ab73fda776c69af239947310cd170f 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Dedupe/Exception.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:c2bdf0b5dc00abebb9c5de4a55c6e718)
+ * (GenCodeChecksum:1df7735bf1c4199f7b7ec94b1d406c14)
  */
 
 /**
index e9b3fd7cf9edefc64c5c27fbbaf2fb787b0a7dc2..0520f1d21ef839f9413e2603a5247af431eddc16 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Dedupe/Rule.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:f51604da4ecc188a040e1c84ad44fc22)
+ * (GenCodeChecksum:30ac1f4265b98b426df72998fe049025)
  */
 
 /**
index 3d1b6fc2d2f8c69dd0b51463c82fc6fed64fc3d5..acf72886eb8585d41fafaa387aa24d57f37f884a 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Dedupe/RuleGroup.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:f0256f996783b78fd4f360fd80fe2119)
+ * (GenCodeChecksum:2e17168197c3a81d0280c153b668dc6e)
  */
 
 /**
index 8531b9ecc7f3f7c6c792a7339ad9a0773c2347ea..dbd0037e5ef7a043dcf584d6e0f74429e93c7f09 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Event/Cart/Cart.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:0c19d3833a1e69a4e514d8f28f329626)
+ * (GenCodeChecksum:7b08194ffb923d40298dfa67886a3be2)
  */
 
 /**
index 6f3812b365bab06546b535b46b7fa5bc46ef9dbd..88463d5f162b115540157e7c8966e7c345e1ffbc 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Event/Cart/EventInCart.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:b5fd29f887cfd20b67dcc75088800607)
+ * (GenCodeChecksum:810abc7e3ff25bad4a4a0ef82c8158c7)
  */
 
 /**
index f28c91c2f1e802093c741e93d69fa01b6870f6fb..c6facb40120547a31c7a33be925df6e8029b82ab 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Event/Event.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:6fc495deedb92d867cbfb452e52e1106)
+ * (GenCodeChecksum:5a41f356ab1d50b2203cbef7ca3fc90a)
  */
 
 /**
index 66d2acf1a7c5dda74377e49264440bfb82e67066..68fa6bcc9814efac886c207195d62c89076a44a7 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Event/Participant.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:b848cf2d8ba84cd10dae7a056b1b0c68)
+ * (GenCodeChecksum:919ea3218803ca5851b09181115c1c58)
  */
 
 /**
index cf4e80bc85dbb2a6d8d925af0d8c4302b9ed97de..509fff0ee81bf158be636dcf0841b8e970322125 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Event/ParticipantPayment.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:16048a6d761c165c57861d09d81b15bd)
+ * (GenCodeChecksum:a439bb3f9e139078684c158e8c47748b)
  */
 
 /**
index ac353201e2be47d38f81ca515e4534e0e112f939..05cf5eccbc7b6e6a5f899567536b610af7cd0427 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Event/ParticipantStatusType.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:41d33d3b2c1ac5b32faab197d3b59398)
+ * (GenCodeChecksum:ff67f80115b20f29d4237edbfff9fe83)
  */
 
 /**
index ae929e059db7fe561f0731b4bf05f36487fb721e..eac4ba014921cda876d424c191005599501108e3 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Financial/Currency.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:862b5aae448d4eb4ce0456a25cb71cc7)
+ * (GenCodeChecksum:210360337389e12e2b94d9b69542e2b5)
  */
 
 /**
index b1e8b0ddb02611683d24952b01bf5089fc83abbd..b9abd0804aa98b17ea47716a31bfbb0f1d070290 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Financial/EntityFinancialAccount.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:402c8a166ba3809a371a29959f1b9799)
+ * (GenCodeChecksum:9d665341d7a4293411adf33acafdae1d)
  */
 
 /**
index 14724a83a202bf970a37d1fc70069dd2cfc989be..c14ad58b4ed8dee3272ae7c4f9645d1c0419b75f 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Financial/EntityFinancialTrxn.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:aaf1fadaa10b8555005cd59f0e14a568)
+ * (GenCodeChecksum:d1f8caf14eed45d30b99be154c7f3650)
  */
 
 /**
index d5522bce08243f47a48707f76e99b61c6690cb77..6c3c61988efccbe9352a0905c57b4b6d10308e6f 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Financial/FinancialAccount.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:b2c229b871107d223bcf8af8419ee792)
+ * (GenCodeChecksum:05c251d7bf5f98a35b4a25abb98b70c8)
  */
 
 /**
index b8a7537c236e2c0de5429b8dc9b7492e1b2ec7e1..2fe78840e288f7371216a448f0d9bd96d32f8642 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Financial/FinancialItem.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:89451392c63f3412435530a1d0deae5d)
+ * (GenCodeChecksum:0746b9db4a912a1ec5242e15622e4ba8)
  */
 
 /**
index deb67cd909ab5c9efebe7b79bb91ec4b61fd7330..1c18b197278d63b30efedf6964edad98f3994e0d 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Financial/FinancialTrxn.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:fc0ec729cc84b9593f4cdeed22807f59)
+ * (GenCodeChecksum:d8b27a1e5bea7078179addfc775e1ca1)
  */
 
 /**
index 3ffc40e40ec41600ee337a5014fed478023a0bea..28dfaff5e0e03fc3a168b63274194e6157105389 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Financial/FinancialType.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:468c9e0af29dcdfa4f9b419dda690325)
+ * (GenCodeChecksum:fbe9cc9ddab4b7f1be7a502240854437)
  */
 
 /**
index c103b7703fc18eabcd8cd7f2451a8576bc631923..48676c59918f8c84a84f167226dabe569bc8bbb4 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Financial/PaymentProcessor.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:3255e0cd1750d234a4cec7d73182990c)
+ * (GenCodeChecksum:6d3b0b9b13fae223bc45c6c1e4ce7b94)
  */
 
 /**
index e870cc631feeceb17a0fb197146198ffd520047d..7230d340df86d725008e88c37b2213523c86072b 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Financial/PaymentProcessorType.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:c70062f305d7cf04e48745fdc3df6504)
+ * (GenCodeChecksum:65231e0b77bcce22bd505b89ace63506)
  */
 
 /**
index 3bea1c6e46d70489bec7e6f91a1340b0f51f01c4..981b34fa11d1369f14706fbe3c7cd6b836daebd1 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Financial/PaymentToken.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:3b1f3c099b464b808e36b41673b98c1a)
+ * (GenCodeChecksum:078a57c5d0afbe495e82999ab197e12b)
  */
 
 /**
index 0e1cc3af6ca71aaaa6ecf9480a98be9eb8282bec..2e11e0822660c4dbcca14bbf4a392cd206fd8d06 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Friend/Friend.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:04bbd009e4d68da0f7e966ee3c780dcb)
+ * (GenCodeChecksum:8218c3da1a68f90b534e4724bd0b89b1)
  */
 
 /**
index b05255eca64733b940c2904470ed4641a6dc315e..bc447c32a91f17982d24ca19dbfff88255875dd9 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Grant/Grant.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:33e12de8a892435e7d199da439efefe6)
+ * (GenCodeChecksum:55398307473a631415b01f5e9b40f7dc)
  */
 
 /**
index 34bf17983bf2234f7520775cde81f6a7fac7ebd9..8ddb1faad08aeefd68e666670b39a633ad6069fc 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/BouncePattern.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:6b50d60bdaf70f0d826e4f71fb7e1b8d)
+ * (GenCodeChecksum:8b252d99f9392e578512acadd28b09ee)
  */
 
 /**
index 073e78f4dae7a6e6fbef6878f97d03ff4d6e702f..d72a3ccc696d6986226ea5768ecb204023e13ba2 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/BounceType.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:2c73785c27d9d0b8980c27443691b8b1)
+ * (GenCodeChecksum:9b56dea1b4b84d786209fd4af84a3e09)
  */
 
 /**
index 83f0211943bb31ea1d3e041574981bab8e047e42..a3bc2c85c9fccb145925b0e9f9e1287ef8e1473b 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Mailing.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:9e3f016db0a2ac72e2c25c9c5e3821a5)
+ * (GenCodeChecksum:c294c497dac6129fe311fe8484e1e975)
  */
 
 /**
index 89080d583e3885d244e3c89f77a24f7a47c93a6c..aa421ff0311c8febf3e0205f1c3ba267aca6d520 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/MailingAB.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:45cbf7496c9fc0390db80c90911972e4)
+ * (GenCodeChecksum:2ddb755cd73dfcc880467c192d4f4b6c)
  */
 
 /**
index 858090bb13c62145961dc03cbd4880d5c52584d5..beb28dd57785c3e6c745fd3103013ac1c4f36cf6 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/MailingComponent.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:e082d5c712aadfb34ce2dedafeee74b9)
+ * (GenCodeChecksum:935e7f9a3718032018ccb082a6c4500c)
  */
 
 /**
index 045b6cd524bff2c16f7ddf33c7994e8efa8d2094..c645c1ac9a049b71577afdbdf9d075b8e3e892d8 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/MailingGroup.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:251b8dd5f585f69b32ebc5d5e509135e)
+ * (GenCodeChecksum:c4fc1c2b7ccba1f63edbf40993dae6ea)
  */
 
 /**
index 40c9eca89e95aea7f2dda3eeb259df5410980702..f891f18c2b5631b3363d521d79365529d2e6eabf 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/MailingJob.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:d974b81d2de971b10634794130261b3e)
+ * (GenCodeChecksum:195e6d4c124fba8e32203464c1b38673)
  */
 
 /**
index 9b539a0f5b0278ea762a5ab6750c25e90b7e8e00..f47f82da35490fee154fb3c56812447362c9a669 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Recipients.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:b5e7e162aa5154171c57d7de1e484d77)
+ * (GenCodeChecksum:0792d1ac654c050dfc735f63f20fe0cd)
  */
 
 /**
index e2f960cf3f0a4ad6dfc4e7566be50e902ed141d0..7b4de7e1f14d22503e29af2f533d5b7b9a27ae70 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Spool.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:328c2bef8b4227378923d9d9e6fc5307)
+ * (GenCodeChecksum:5b1d2a1cce94c7b2c330b62f3b76e2e1)
  */
 
 /**
index faa50c5362428cb9e85830959f71c643e8275304..78867ac53af1f0550b57b858ab48bbfd076910bc 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/TrackableURL.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:627457119055a90330a2ac9befafd679)
+ * (GenCodeChecksum:4e58345d210aa786e7653982fc998c37)
  */
 
 /**
index bcf3cf915a874e9f9d9b3089f86c23d6b1ffd5cc..c17b5deba6656fcaed919c6a0e1f2112ca59bba9 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Event/Bounce.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:242dfeae734755f1cacb3af7b08c331d)
+ * (GenCodeChecksum:ba4d55bd1a33a5d0fc17b22a3be114f7)
  */
 
 /**
index 7180aaf75f6acdb2e9325a34c7bcc98ecd0e1d8d..304eaa76ac98996b39605eae2636383342889b91 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Event/Confirm.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:c14a004f07a27f4c43e85c325cb2eaa1)
+ * (GenCodeChecksum:fa4cd94c6068f7729b05ba10ab255b05)
  */
 
 /**
index f10840e8f5f9d6ac63cd490095650477d1d05e17..0a13e9075d2f97aaa81ed789e64a7a8b51ba3cb5 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Event/Delivered.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:1e8b764f8ec28d81bdc4eb721988b4f8)
+ * (GenCodeChecksum:5791e88cffd626e36daaddcccbc687a0)
  */
 
 /**
index f409781aecf211faf57fb6097daa3011de32914e..010281e3f94905ffbbb1c027b426411fe435fc8d 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Event/Forward.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:fbff44da80d2e268d0fcb1514dc41ffd)
+ * (GenCodeChecksum:b96d36e0d04a4a6039a8e9a3b782a35e)
  */
 
 /**
index e001bc82e278d8ce738ff2e695d104749f63aba9..84f77dc6088a657f0a88cdc83394d9f8a3f71bb4 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Event/Opened.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:3137f709d2d90310071417bf1ba3fd2f)
+ * (GenCodeChecksum:09dbc5750f23402fe8ffe9ca0cffd0ba)
  */
 
 /**
index 69e1401c33c5476e5879bab0f478da44874c2cc2..9814d0b546ce0bfef650429299e04ea58eb93291 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Event/Queue.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:10e0744e0adb4393d37a8fbbbe585e4b)
+ * (GenCodeChecksum:8099f8e634a052f6641abaa2e0f3dae6)
  */
 
 /**
index f125bf148343401a4a6bc6aa9a06fbfc140ba7e6..e88e2fcb4a87cc465f5b4c2829a03d5b7bd90a53 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Event/Reply.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:98fb3b43e0d0fb2cd6692dced2e6e976)
+ * (GenCodeChecksum:bfd8c0c2ed7f32539508ddf2fe6d27b2)
  */
 
 /**
index f40c444a741190020745373c896807e4d22d5376..e6792043f8b15d9c32df14dd283df2711715936a 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Event/Subscribe.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:b11ac04360acd1807fd79c83dac6378e)
+ * (GenCodeChecksum:081be4da95465c1f28e13d936b372345)
  */
 
 /**
index 0a7ba546a2f93131e194df1cac0a4bad149c019b..fdbb899736b4f3ec66ae62b63dea4f0f68076907 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Event/TrackableURLOpen.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:1f5cdd9da44ad1fe0fa03b6d1833e0c2)
+ * (GenCodeChecksum:eb4907c60fad19559fe6dcc069445590)
  */
 
 /**
index c62df7d7e7ac285d90271c670a4ef3e0e8a13161..66368db6066dd5042af66339c4b5b53637ed064f 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Event/Unsubscribe.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:3b8b2645e8dea3913117ab02495540b5)
+ * (GenCodeChecksum:0d53b8194940aab51adb66b6abb11fc3)
  */
 
 /**
index 1f4aa41c55cb6826ef8e402527df6bac861bb5db..a0ae8f5b656ecd48e891a260e3de5921e7fd0676 100644 (file)
@@ -444,17 +444,21 @@ LEFT JOIN  civicrm_contact scheduledContact ON ( $mailing.scheduled_id = schedul
           $validLinks[CRM_Core_Action::BROWSE] = [
             'name' => ts('Public View'),
             'url' => 'civicrm/mailing/view',
-            'qs' => 'id=%%mid%%&reset=1',
+            'qs' => 'id=%%hashOrMid%%&reset=1',
             'title' => ts('Public View'),
             'fe' => TRUE,
           ];
           $actionMask |= CRM_Core_Action::BROWSE;
         }
 
+        $hash = CRM_Mailing_BAO_Mailing::getMailingHash($row['id']);
         $rows[$key]['action'] = CRM_Core_Action::formLink(
           $validLinks,
           $actionMask,
-          ['mid' => $row['id']],
+          [
+            'mid' => $row['id'],
+            'hashOrMid' => $hash ? $hash : $row['id'],
+          ],
           "more",
           FALSE,
           $opString,
index 28dfaa8a02fc0d5323998c91509ab85b281559fc..3fa1ead53912a70eb40d55c46e24b39b69a56c83 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Member/Membership.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:c68c3f9a34e0ff4431b3da64013f14ae)
+ * (GenCodeChecksum:64ef044391b9dee565e8e2a9d893f4cf)
  */
 
 /**
index ea027ff2168f99527bdfa0f6eeabf33e75cb6b58..de4a3eda67c29d9a5a06bdfeebb6fd2227dcfc1b 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Member/MembershipBlock.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:edf144d99fad0880e2896643b00645c5)
+ * (GenCodeChecksum:46b23c9cb5e0d22669e4f9a63966e6df)
  */
 
 /**
index ff1f7611a1a59e3afadaa25a802efb3d6de8c328..47b6737f6baea3ee4e046bc7ef1268d046cfd317 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Member/MembershipLog.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:0d7db89ce437b460a04fd053016c6815)
+ * (GenCodeChecksum:7e7992e145cb104f8fddaac2a7f60c99)
  */
 
 /**
index ab0075768310934a82905553b5d278a43f5b73a5..0495523c2ba96179d3df760aa8202841e93e331d 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Member/MembershipPayment.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:8f70a311f1a6ec877d053b01431d98cc)
+ * (GenCodeChecksum:63ca9fcae0a4e6bffb8423ccdf019cdc)
  */
 
 /**
index 2f4b03014435ef9ce6256bb71bbab7decde24264..f0c111dbfeb694ddf062c7568b6bfa2f7a0e9f19 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Member/MembershipStatus.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:03028177503f64a5c50d7ed10858c614)
+ * (GenCodeChecksum:d292d809591c784c47942f54aba6765f)
  */
 
 /**
index e5d60dc87b6af632242e2d46c17d4f5a41446448..7ad60e02cce9a6a5c9335914abff68064bd61310 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Member/MembershipType.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:fc870f663bc281a6973667061867b590)
+ * (GenCodeChecksum:b166299a8c5c846f5cb4f34fd6532f55)
  */
 
 /**
index 981687b04eb0bbfb3e1c5e1ba3262fcc4e975566..554965ad5e47cf43316ceca2b5b2138b9dd10c9a 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/PCP/PCP.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:55e3c2126bb5f4c9f93161660977a4d1)
+ * (GenCodeChecksum:6dab4bfdec110d18dc9457ca3e83a0d6)
  */
 
 /**
index 19b6dbc2cc4511ac54c23300a2fc042a2cb2e7c1..2fa66b91dd3d76d4e8fbf4c961ce2a1b1db09b08 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/PCP/PCPBlock.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:540832625ac42de5f986853162733eb3)
+ * (GenCodeChecksum:42d329d90e59aac0c5480ba2a50aec83)
  */
 
 /**
index 9a8cc6e54eeec903cb899c88857e8e9b771523dc..d38eb70577a221c028a78a3af8101deee5f9b02c 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Pledge/Pledge.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:d6e715c100f3ce5b366029ec6f45a654)
+ * (GenCodeChecksum:117f63c183c68fcf5bd882f3fc40173e)
  */
 
 /**
index ff335a0cb2df09c597d55854807e067cbaec6b01..d261ba53dc97ef95b09181590ff8afad3f0dab1d 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Pledge/PledgeBlock.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:82e5abfad86a7c111364d89d53a7148e)
+ * (GenCodeChecksum:dd1489be32b1ac4cf012b93cb68afb10)
  */
 
 /**
index 2a46fab3315f6efd59a32457a671a767d5dead2d..a2c000037e543e9a758cc6bc3583c93ad4e464dd 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Pledge/PledgePayment.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:42ab1e4af6c75121cdd4800019ea328d)
+ * (GenCodeChecksum:9f610b55354cf1a7c509cf685a03187b)
  */
 
 /**
index 9813a743dbbdd8bd5a1484e0da29352feb40ef06..46b36ce92530d255af488b7f8a3ea30a9553f984 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Price/LineItem.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:af73e12b37d09f2872023bb12d01f5a2)
+ * (GenCodeChecksum:90fb6a08063f00282825bb1c567eea1a)
  */
 
 /**
index 9df77e7cb4217d74773c7f4651fcb519d8d08568..310c8d3bfd85609a0990c88b0128d1d1a60edb16 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Price/PriceField.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:4708670ea69ac42ea2c5a57d2c98b658)
+ * (GenCodeChecksum:f96f9517fa4009fff3275da63195efd3)
  */
 
 /**
index 795230bb4a2d079d6857f04967519f6942750417..570af072cefe21eb91a83e620fc820e6c9e5233d 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Price/PriceFieldValue.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:2c8649ea76f5f5b5548c1aae5c29e26e)
+ * (GenCodeChecksum:ba3d9fa454b710c09e18299d8531a9b2)
  */
 
 /**
index 1384fad77cb0cf0028dc9d0327e1c814aee2d681..f6eeeb91db8dedf72950f3367a1f21df90d05bc7 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Price/PriceSet.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:8349105b7c9354cccdf8dac30d9ffd8a)
+ * (GenCodeChecksum:b8036fb0c2f5ad76f8f3bdf93f9db0f0)
  */
 
 /**
index 1824e53eb48d1e5e26af082a015eadf734246733..125a59f37a25ec044400d5bd8b256e17b31de814 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Price/PriceSetEntity.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:a986b1e45928f1ed8034c498506955a0)
+ * (GenCodeChecksum:2af9002085aaf369b570094e32bff851)
  */
 
 /**
index 08e281d69d5797be3f2150f5c147822f8cc1d9f4..c506daacb9351e37f126a0d1e30add5a8ae49bec 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Queue/QueueItem.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:84cb9a5dd61744311fda1a002b85a6d1)
+ * (GenCodeChecksum:ab2c0a25c3fd72fd4911003d325dbcb6)
  */
 
 /**
index 8c79fd67b9d47ac6776534d5f29f806c692b7259..584131d543089694a157ceef9d81eee0eab801de 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Report/ReportInstance.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:459056d6f22bc2f222f719dadc27f21e)
+ * (GenCodeChecksum:3d5de82ad4a99a689201d8d5a35268a4)
  */
 
 /**
index 3e9d2b1123f136f8addc6d3d0893f7440c733229..4e70351e744b90164d68da4e91a0a17e841ed747 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/SMS/Provider.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:84ab732be9b0567de8927ab96bb656ba)
+ * (GenCodeChecksum:ce82211615815557cb6ac33f445b6898)
  */
 
 /**
index b89d56cd0c03b8ae65592db5fa27eb860e596573..622e1aae9acccbcfee615a7fbbefbcddea095c59 100644 (file)
@@ -1441,6 +1441,7 @@ class CRM_Utils_System {
       Civi::cache('community_messages')->flush();
       Civi::cache('groups')->flush();
       Civi::cache('navigation')->flush();
+      Civi::cache('customData')->flush();
       CRM_Extension_System::singleton()->getCache()->flush();
       CRM_Cxn_CiviCxnHttp::singleton()->getCache()->flush();
     }
@@ -1448,7 +1449,7 @@ class CRM_Utils_System {
     // also reset the various static memory caches
 
     // reset the memory or array cache
-    CRM_Core_BAO_Cache::deleteGroup('contact fields', NULL, FALSE);
+    Civi::cache('fields')->flush();
 
     // reset ACL cache
     CRM_ACL_BAO_Cache::resetCache();
index 1dc5d53b277088c201e878a0025bc94e4d257b7b..55c2b92e2b317c6d9b15be97e09ce776ae08e603 100644 (file)
@@ -158,6 +158,8 @@ class Container {
       'long' => 'long',
       'groups' => 'contact groups',
       'navigation' => 'navigation',
+      'customData' => 'custom data',
+      'fields' => 'contact fields',
     ];
     foreach ($basicCaches as $cacheSvc => $cacheGrp) {
       $definitionParams = [
@@ -167,7 +169,7 @@ class Container {
       // For Caches that we don't really care about the ttl for and/or maybe accessed
       // fairly often we use the fastArrayDecorator which improves reads and writes, these
       // caches should also not have concurrency risk.
-      $fastArrayCaches = ['groups', 'navigation'];
+      $fastArrayCaches = ['groups', 'navigation', 'customData', 'fields'];
       if (in_array($cacheSvc, $fastArrayCaches)) {
         $definitionParams['withArray'] = 'fast';
       }
index 2809fa382df039e2c66f88cf928e751e6819bf23..ebd098bdd4981006d14e16a090851c41d0f9738c 100644 (file)
@@ -1195,7 +1195,8 @@ class CRM_GCD {
     //In this function when we add groups that time we are cache the contact fields
     //But at the end of setup we are appending sample custom data, so for consistency
     //reset the cache.
-    CRM_Core_BAO_Cache::deleteGroup('contact fields');
+    Civi::cache('fields')->flush();
+    CRM_Core_BAO_Cache::resetCaches();
   }
 
   /**
index dd74843a02d672476574357d71923db486b04f2d..e3b1dfd33261e299610207bac6ef83d7d8361bbf 100644 (file)
  *
  */
 
+/*
+ * Note as of 2019-07-15 this file does not appear to be called
+ * from anywhere and seems to have issues running on more recent
+ * php versions.
+ * @todo look to remove this file completely.
+ */
+
 
 require_once '../civicrm.config.php';
 
-require_once 'CRM/Core/Config.php';
-require_once 'CRM/Core/Error.php';
-require_once 'CRM/Core/I18n.php';
-
-require_once 'CRM/Core/DAO/Address.php';
-require_once 'CRM/Core/DAO.php';
-require_once 'CRM/Core/DAO/Phone.php';
-require_once 'CRM/Core/DAO/Email.php';
-require_once 'CRM/Core/DAO/EntityTag.php';
-require_once 'CRM/Core/DAO/Note.php';
-require_once 'CRM/Core/DAO/Domain.php';
-
-require_once 'CRM/Contact/DAO/Group.php';
-require_once 'CRM/Contact/DAO/GroupContact.php';
-require_once 'CRM/Contact/DAO/SubscriptionHistory.php';
-require_once 'CRM/Contact/DAO/Contact.php';
-require_once 'CRM/Contact/DAO/Relationship.php';
-require_once 'CRM/Event/DAO/Participant.php';
-require_once 'CRM/Contribute/DAO/ContributionSoft.php';
-require_once 'CRM/Member/DAO/MembershipPayment.php';
+// autoload
+require_once 'CRM/Core/ClassLoader.php';
+CRM_Core_ClassLoader::singleton()->register();
 
 /**
  * Class CRM_GCD
@@ -1173,8 +1163,8 @@ class CRM_GCD {
     //In this function when we add groups that time we are cache the contact fields
     //But at the end of setup we are appending sample custom data, so for consistency
     //reset the cache.
-    require_once 'CRM/Core/BAO/Cache.php';
-    CRM_Core_BAO_Cache::deleteGroup('contact fields');
+    Civi::cache('fields')->flush();
+    CRM_Core_BAO_Cache::resetCaches();
   }
 
   /**
index 132b87fdb46e8a43812d2eb6adee51b6adedd106..bb7547e76b3d164b6e4b1b277faf5d461827a512 100644 (file)
@@ -400,7 +400,7 @@ class CRM_Contribute_Form_SearchTest extends CiviUnitTestCase {
    *
    * @dataProvider getSearchData
    */
-  public function testContributionRecurSearchFilters($formValues, $expectedCount, $expectedContact, $expectedQill) {
+  public function testContributionRecurSearchFilters($formValues, $expectedCount, $expectedContact, $expectedQill, $expectedWhere = NULL) {
     $this->setUpRecurringContributions();
 
     $query = new CRM_Contact_BAO_Query(CRM_Contact_BAO_Query::convertFormValues($formValues));
@@ -408,14 +408,22 @@ class CRM_Contribute_Form_SearchTest extends CiviUnitTestCase {
 
     // get and assert contribution count
     $contacts = CRM_Core_DAO::executeQuery(sprintf('SELECT DISTINCT contact_a.id, contact_a.display_name %s %s AND contact_a.id IS NOT NULL', $from, $where))->fetchAll();
-    foreach ($contacts as $key => $value) {
-      $this->assertEquals($expectedContact[$key], $value['display_name']);
+    if ($expectedCount) {
+      foreach ($contacts as $key => $value) {
+        $this->assertEquals($expectedContact[$key], $value['display_name']);
+      }
     }
     // assert the contribution count
     $this->assertEquals($expectedCount, count($contacts));
     // get and assert qill string
-    $qill = trim(implode($query->getOperator(), CRM_Utils_Array::value(0, $query->qill())));
+    $qill = $query->qill();
+    $qillString = !empty($qill[1]) ? $qill[1] : CRM_Utils_Array::value(0, $qill);
+    $qill = trim(implode($query->getOperator(), $qillString));
     $this->assertEquals($expectedQill, $qill);
+
+    if ($expectedWhere) {
+      $this->assertEquals($expectedWhere, $query->_where[1][0]);
+    }
   }
 
   /**
@@ -551,11 +559,12 @@ class CRM_Contribute_Form_SearchTest extends CiviUnitTestCase {
       'financial_type_id' => 'Donation',
       'trxn_id' => 'a transaction',
       'processor_id' => 'a processor',
+      'start_date' => '20180101',
     ]);
     $Contribution2 = $this->callAPISuccess('Contribution', 'create', [
       'financial_type_id' => 'Donation',
       'total_amount' => 22,
-      'receive_date' => date('Ymd'),
+      'receive_date' => '20180101',
       'receive_date_time' => NULL,
       'payment_instrument' => 1,
       'contribution_status_id' => 1,
@@ -611,6 +620,91 @@ class CRM_Contribute_Form_SearchTest extends CiviUnitTestCase {
         'expected_contact' => ['Mr. Terrence Smith II'],
         'expected_qill' => "Recurring Contribution Processor ID = 'a processor'",
       ],
+      'receive_date_search' => [
+        'form_value' => [['receive_date_high', '=', 20180101, 1, 0]],
+        'expectedResult' => 1,
+        'expected_contact' => ['Mr. Terrence Smith II'],
+        'expected_qill' => 'Date Received - less than or equal to "January 1st, 2018 12:00 AM"',
+        'expected_where' => "civicrm_contribution.receive_date <= '20180101000000'",
+      ],
+      'thankyou_date_search' => [
+        'form_value' => [['thankyou_date_high', '=', 20180101, 1, 0]],
+        'expectedResult' => 0,
+        'expected_contact' => [],
+        'expected_qill' => 'Thank-you Date - less than or equal to "January 1st, 2018 12:00 AM"',
+        'expected_where' => "civicrm_contribution.thankyou_date <= '20180101000000'",
+      ],
+      'cancel_date_search_low' => [
+        'form_value' => [['contribution_cancel_date_low', '=', 20180101, 1, 0]],
+        'expectedResult' => 0,
+        'expected_contact' => [],
+        'expected_qill' => 'Cancelled / Refunded Date - greater than or equal to "January 1st, 2018 12:00 AM"',
+        'expected_where' => "civicrm_contribution.cancel_date >= '20180101000000'",
+      ],
+      'cancel_date_search' => [
+        'form_value' => [['contribution_cancel_date', '=', 20180101, 1, 0]],
+        'expectedResult' => 0,
+        'expected_contact' => [],
+        'expected_qill' => 'Cancelled / Refunded Date = January 1st, 2018 12:00 AM',
+        'expected_where' => "civicrm_contribution.cancel_date = '20180101000000'",
+      ],
+      'cancel_date_relative' => [
+        'form_value' => [['contribution_cancel_date_relative', '=', 'this.year', 1, 0]],
+        'expectedResult' => 0,
+        'expected_contact' => [],
+        'expected_qill' => 'Cancelled / Refunded Date is This calendar year (between January 1st, ' . date('Y') . ' 12:00 AM and December 31st, ' . date('Y') . ' 11:59 PM)',
+        'expected_where' => "civicrm_contribution.cancel_date BETWEEN '" . date('Y') . "0101000000' AND '" . date('Y') . "1231235959'",
+      ],
+      'receipt_date_search_low' => [
+        'form_value' => [['receipt_date_low', '=', 20180101, 1, 0]],
+        'expectedResult' => 0,
+        'expected_contact' => [],
+        'expected_qill' => 'Receipt Date - greater than or equal to "January 1st, 2018 12:00 AM"',
+        'expected_where' => "civicrm_contribution.receipt_date >= '20180101000000'",
+      ],
+      'receipt_date_search' => [
+        'form_value' => [['receipt_date', '=', 20180101, 1, 0]],
+        'expectedResult' => 0,
+        'expected_contact' => [],
+        'expected_qill' => 'Receipt Date = \'20180101\'',
+        'expected_where' => "civicrm_contribution.receipt_date = 20180101",
+      ],
+      'revenue_recognition_search_high' => [
+        'form_value' => [['revenue_recognition_date_high', '=', 20180101, 1, 0]],
+        'expectedResult' => 0,
+        'expected_contact' => [],
+        'expected_qill' => 'Revenue Recognition Date - less than or equal to "January 1st, 2018 12:00 AM"',
+        'expected_where' => "civicrm_contribution.revenue_recognition_date <= '20180101000000'",
+      ],
+      'revenue_recognition_search' => [
+        'form_value' => [['revenue_recognition_date', '=', 20180101, 1, 0]],
+        'expectedResult' => 0,
+        'expected_contact' => [],
+        'expected_qill' => 'Revenue Recognition Date = \'20180101\'',
+        'expected_where' => "civicrm_contribution.revenue_recognition_date = 20180101",
+      ],
+      'start_date_search' => [
+        'form_value' => [['contribution_recur_start_date', '=', 20180101, 1, 0]],
+        'expectedResult' => 1,
+        'expected_contact' => ['Mr. Terrence Smith II'],
+        'expected_qill' => 'Recurring Contribution Start Date = January 1st, 2018 12:00 AM',
+        'expected_where' => "civicrm_contribution_recur.start_date = '20180101000000'",
+      ],
+      'start_date_search_high' => [
+        'form_value' => [['contribution_recur_start_date_high', '<=', 20180101, 1, 0]],
+        'expectedResult' => 1,
+        'expected_contact' => ['Mr. Terrence Smith II'],
+        'expected_qill' => 'Recurring Contribution Start Date - less than or equal to "January 1st, 2018 12:00 AM"',
+        'expected_where' => "civicrm_contribution_recur.start_date <= '20180101000000'",
+      ],
+      'start_date_search_relative' => [
+        'form_value' => [['contribution_recur_start_date_relative', '=', 'this.year', 1, 0]],
+        'expectedResult' => 1,
+        'expected_contact' => ['Mr. Joe Miller II'],
+        'expected_qill' => 'Start Date is This calendar year (between January 1st, ' . date('Y') . ' 12:00 AM and December 31st, ' . date('Y') . ' 11:59 PM)',
+        'expected_where' => "civicrm_contribution_recur.start_date BETWEEN '" . date('Y') . "0101000000' AND '" . date('Y') . "1231235959'",
+      ],
+
     ];
     return $useCases;
   }
index 97bc37c35d54873aa3ea3da6cea4563fcd5c5ddc..9ac04a4f689c6158b8b35a73b6d46f56693ec88d 100644 (file)
       <type>Select Date</type>
       <formatType>activityDateTime</formatType>
     </html>
+    <uniqueName>contribution_recur_start_date</uniqueName>
+    <uniqueTitle>Recurring Contribution Start Date</uniqueTitle>
   </field>
   <field>
     <name>create_date</name>
       <type>Select Date</type>
       <formatType>activityDateTime</formatType>
     </html>
+    <uniqueName>contribution_recur_create_date</uniqueName>
+    <uniqueTitle>Recurring Contribution Create Date</uniqueTitle>
   </field>
   <field>
     <name>modified_date</name>
       <type>Select Date</type>
       <formatType>activityDateTime</formatType>
     </html>
+    <uniqueName>contribution_recur_modified_date</uniqueName>
+    <uniqueTitle>Recurring Contribution Modified Date</uniqueTitle>
   </field>
   <field>
     <name>cancel_date</name>
       <type>Select Date</type>
       <formatType>activityDate</formatType>
     </html>
+    <uniqueName>contribution_recur_cancel_date</uniqueName>
+    <uniqueTitle>Recurring Contribution Cancel Date</uniqueTitle>
   </field>
   <field>
     <name>cancel_reason</name>
     <type>text</type>
     <title>Cancellation Reason</title>
     <uniqueName>contribution_recur_cancel_reason</uniqueName>
+    <uniqueTitle>Recurring Contribution Cancel Reason</uniqueTitle>
     <comment>Free text field for a reason for cancelling</comment>
     <html>
       <type>Text</type>
       <type>Select Date</type>
       <formatType>activityDate</formatType>
     </html>
+    <uniqueName>contribution_recur_end_date</uniqueName>
+    <uniqueTitle>Recurring Contribution End Date</uniqueTitle>
   </field>
   <field>
     <name>processor_id</name>
       <type>Select Date</type>
       <formatType>activityDate</formatType>
     </html>
+    <uniqueName>contribution_recur_next_sched_contribution_date</uniqueName>
+    <uniqueTitle>Next Scheduled Recurring Contribution</uniqueTitle>
   </field>
   <field>
     <name>failure_count</name>
       <type>Select Date</type>
       <formatType>activityDate</formatType>
     </html>
+    <uniqueName>contribution_recur_failure_retry_date</uniqueName>
+    <uniqueTitle>Failed Recurring Contribution Retry Date</uniqueTitle>
   </field>
   <field>
     <name>auto_renew</name>
index e9d6f36eca7ede02f9d80ea0c21175cb19de0261..b9cebe59abb6bce3025e795602d547f739ce6646 100644 (file)
@@ -146,6 +146,9 @@ class {$table.className} extends CRM_Core_DAO {ldelim}
 {if $field.serialize}
   'serialize' => self::SERIALIZE_{$field.serialize|strtoupper},
 {/if}
+{if $field.uniqueTitle}
+  'unique_title' => {$tsFunctionName}('{$field.uniqueTitle}'),
+{/if}
 {if $field.html}
   'html' => array(
   {foreach from=$field.html item=val key=key}