Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Rollback of #631486 (wrong incomplete commit)

merge-requests/26/head
Dries Buytaert 2009-11-13 11:59:14 +00:00
parent a6ae1c6cfa
commit e218e24a96
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/field/field.info.inc
View File

@ -64,12 +64,12 @@ function _field_info_collate_types($reset = FALSE) {
if ($reset) { if ($reset) {
$info = NULL; $info = NULL;
cache_clear_all('field_info_types', 'cache_bootstrap'); cache_clear_all('field_info_types', 'cache_field');
return; return;
} }
if (!isset($info)) { if (!isset($info)) {
if ($cached = cache_get('field_info_types', 'cache_bootstrap')) { if ($cached = cache_get('field_info_types', 'cache_field')) {
$info = $cached->data; $info = $cached->data;
} }
else { else {
@ -137,7 +137,7 @@ function _field_info_collate_types($reset = FALSE) {
} }
drupal_alter('field_storage_info', $info['storage types']); drupal_alter('field_storage_info', $info['storage types']);
cache_set('field_info_types', $info, 'cache_bootstrap'); cache_set('field_info_types', $info, 'cache_field');
} }
} }
@ -168,12 +168,12 @@ function _field_info_collate_fields($reset = FALSE) {
if ($reset) { if ($reset) {
$info = NULL; $info = NULL;
cache_clear_all('field_info_fields', 'cache_field_bootstrap'); cache_clear_all('field_info_fields', 'cache_field');
return; return;
} }
if (!isset($info)) { if (!isset($info)) {
if ($cached = cache_get('field_info_fields', 'cache_bootstrap')) { if ($cached = cache_get('field_info_fields', 'cache_field')) {
$definitions = $cached->data; $definitions = $cached->data;
} }
else { else {
@ -181,7 +181,7 @@ function _field_info_collate_fields($reset = FALSE) {
'field_ids' => field_read_fields(array(), array('include_deleted' => 1)), 'field_ids' => field_read_fields(array(), array('include_deleted' => 1)),
'instances' => field_read_instances(), 'instances' => field_read_instances(),
); );
cache_set('field_info_fields', $definitions, 'cache_bootstrap'); cache_set('field_info_fields', $definitions, 'cache_field');
} }
// Populate 'field_ids' with all fields. // Populate 'field_ids' with all fields.