diff -u b/includes/cache.inc b/includes/cache.inc --- b/includes/cache.inc +++ b/includes/cache.inc @@ -80,7 +80,7 @@ /** * Return data from the persistent cache. Data may be stored as either plain - * text or as serialized data. cache_get will automatically return + * text or as serialized data. Will automatically return * unserialized objects and arrays. * * @param $cid @@ -234,7 +234,8 @@ * data as appropriate. * * @param $cache - * An item loaded from cache_get() or cache_get_multiple(). + * An item loaded from DrupalDatabaseCache::get() or + * DrupalDatabaseCache::getMultiple(). * @return * The item with data unserialized as appropriate or FALSE if there is no * valid item to load. @@ -285,7 +286,7 @@ ->execute(); } catch (Exception $e) { - // The database may not be available, so we'll ignore cache_set requests. + // The database may not be available, so we'll ignore these calls. } } only in patch2: unchanged: --- a/includes/module.inc +++ b/includes/module.inc @@ -640,10 +640,10 @@ function module_implements($hook, $sort = FALSE, $reset = FALSE) { // request. Benchmarks show that the benefit of this caching outweighs the // additional database hit even when using the default database caching // backend and only a small number of modules are enabled. The cost of the - // cache_get() is more or less constant and reduced further when non-database - // caching backends are used, so there will be more significant gains when a - // large number of modules are installed or hooks invoked, since this can - // quickly lead to module_hook() being called several thousand times + // cache('bootstrap')->get() is more or less constant and reduced further when + // non-database caching backends are used, so there will be more significant + // gains when a large number of modules are installed or hooks invoked, since + // this can quickly lead to module_hook() being called several thousand times // per request. if ($reset) { $implementations = array(); only in patch2: unchanged: --- a/modules/field/field.attach.inc +++ b/modules/field/field.attach.inc @@ -634,7 +634,7 @@ function field_attach_load($entity_type, $entities, $age = FIELD_LOAD_CURRENT, $ foreach ($entities as $id => $entity) { $cids[] = "field:$entity_type:$id"; } - $cache = cache_get_multiple($cids, 'cache_field'); + $cache = cache('cache_field')->getMultiple($cids); // Put the cached field values back into the entities and remove them from // the list of entities to query. foreach ($entities as $id => $entity) { only in patch2: unchanged: --- a/modules/system/system.install +++ b/modules/system/system.install @@ -1471,7 +1471,7 @@ function system_schema() { 'default' => 0, ), 'cache' => array( - 'description' => "The time of this user's last post. This is used when the site has specified a minimum_cache_lifetime. See cache_get().", + 'description' => "The time of this user's last post. This is used when the site has specified a minimum_cache_lifetime. See DrupalCacheInterface::get().", 'type' => 'int', 'not null' => TRUE, 'default' => 0, only in patch2: unchanged: --- a/modules/update/update.module +++ b/modules/update/update.module @@ -724,10 +724,10 @@ function update_verify_update_archive($project, $archive_file, $directory) { * plug-able cache system that assumes volatile caches. * * Update module still uses the {cache_update} table, but instead of using - * cache_set(), cache_get(), and cache_clear_all(), there are private helper - * functions that implement these same basic tasks but ensure that the cache - * is not prematurely cleared, and that the data is always stored in the - * database, even if memcache or another cache backend is in use. + * the cache API, there are private helper functions that implement these same + * basic tasks but ensure that the cache is not prematurely cleared, and that + * the data is always stored in the database, even if memcache or another cache + * backend is in use. */ /**