X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FContact%2FBAO%2FGroupContactCache.php;h=d12ae8b10beffc7c480e8b056bcffea71c8dabe0;hb=757fc7f21936ac57c7e33ab93aa4490407cf9c8b;hp=cb9e1180423959d1f352a0995a3acd1518cd21c9;hpb=b71cb96619f284fb007d4365c33f59f088573d8f;p=civicrm-core.git diff --git a/CRM/Contact/BAO/GroupContactCache.php b/CRM/Contact/BAO/GroupContactCache.php index cb9e118042..d12ae8b10b 100644 --- a/CRM/Contact/BAO/GroupContactCache.php +++ b/CRM/Contact/BAO/GroupContactCache.php @@ -3,7 +3,7 @@ +--------------------------------------------------------------------+ | CiviCRM version 4.6 | +--------------------------------------------------------------------+ - | Copyright CiviCRM LLC (c) 2004-2014 | + | Copyright CiviCRM LLC (c) 2004-2015 | +--------------------------------------------------------------------+ | This file is a part of CiviCRM. | | | @@ -28,7 +28,7 @@ /** * * @package CRM - * @copyright CiviCRM LLC (c) 2004-2014 + * @copyright CiviCRM LLC (c) 2004-2015 * $Id$ * */ @@ -137,7 +137,7 @@ AND ( g.cache_date IS NULL OR $groupIDs = array($groupIDs); } - // note escapeString is a must here and we can't send the imploded value as second arguement to + // note escapeString is a must here and we can't send the imploded value as second argument to // the executeQuery(), since that would put single quote around the string and such a string // of comma separated integers would not work. $groupIDString = CRM_Core_DAO::escapeString(implode(', ', $groupIDs)); @@ -446,7 +446,7 @@ WHERE id = %1 self::$_alreadyLoaded[$groupID] = 1; - // we now have the lock, but some other proces could have actually done the work + // we now have the lock, but some other process could have actually done the work // before we got here, so before we do any work, lets ensure that work needs to be // done // we allow hidden groups here since we dont know if the caller wants to evaluate an @@ -543,7 +543,7 @@ WHERE civicrm_group_contact.status = 'Added' "INSERT IGNORE INTO civicrm_group_contact_cache (contact_id, group_id) SELECT DISTINCT $idName, group_id FROM $tempTable "); - CRM_Core_DAO::executeQuery(" DROP TABLE $tempTable"); + CRM_Core_DAO::executeQuery(" DROP TEMPORARY TABLE $tempTable"); } self::updateCacheTime($groupIDs, $processed);