Merge pull request #15372 from civicrm/5.18

[civicrm-core.git] / sql / GenerateData.php

diff --git a/sql/GenerateData.php b/sql/GenerateData.php
index 13b6c400ea198328cb6171e841769238817ec489..ebd098bdd4981006d14e16a090851c41d0f9738c 100644 (file)
--- a/sql/GenerateData.php
+++ b/sql/GenerateData.php
@@ -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();
   }
 
   /**
@@ -1274,7 +1275,6 @@ class CRM_GCD {
         $this->stateMap[$dao->abbreviation] = $dao->id;
         $this->states[$dao->id] = $dao->name;
       }
-      $dao->free();
     }
 
     $offset = mt_rand(1, 43000);