CRM-18482 import - don't fill acl_contact_cache immediately before emptying it

diff --git a/CRM/Contact/Import/Form/Preview.php b/CRM/Contact/Import/Form/Preview.php
index e979cbc9a0b75ab412d133db328e6d7573b6c529..0a4f1b27d994208b741616dcc352b7fecec82b53 100644 (file)
--- a/CRM/Contact/Import/Form/Preview.php
+++ b/CRM/Contact/Import/Form/Preview.php
@@ -285,12 +285,8 @@ class CRM_Contact_Import_Form_Preview extends CRM_Import_Form_Preview {
     // run the import
     $importJob->runImport($this);
 
-    // update cache after we done with runImport
-    if (!CRM_Core_Permission::check('view all contacts')) {
-      CRM_ACL_BAO_Cache::updateEntry($userID);
-    }
-
-    // clear all caches
+    // Clear all caches, forcing any searches to recheck the ACLs or group membership as the import
+    // may have changed it.
     CRM_Contact_BAO_Contact_Utils::clearContactCaches();
 
     // add all the necessary variables to the form