From 16d2a5df8179d35bf829c2dc3fb4519602e15e04 Mon Sep 17 00:00:00 2001
From: eileenmcnaugton <eileen@fuzion.co.nz>
Date: Fri, 29 Apr 2016 19:42:44 +1200
Subject: [PATCH] CRM-18482 import - don't fill acl_contact_cache immediately
 before emptying it

---
 CRM/Contact/Import/Form/Preview.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/CRM/Contact/Import/Form/Preview.php b/CRM/Contact/Import/Form/Preview.php
index e979cbc9a0..0a4f1b27d9 100644
--- 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
-- 
2.25.1