diff options
| -rw-r--r-- | modules/field/field.info.inc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/modules/field/field.info.inc b/modules/field/field.info.inc index 1c6d6cdde..70b92d6a4 100644 --- a/modules/field/field.info.inc +++ b/modules/field/field.info.inc @@ -181,17 +181,17 @@ function _field_info_collate_types($reset = FALSE) { * whose field is active. */ function _field_info_collate_fields($reset = FALSE) { - static $info; + static $cached_info; if ($reset) { - $info = NULL; + $cached_info = NULL; cache_clear_all('field_info_fields', 'cache_field'); return; } - if (!isset($info)) { + if (!isset($cached_info)) { if ($cached = cache_get('field_info_fields', 'cache_field')) { - $info = $cached->data; + $cached_info = $cached->data; } else { $definitions = array( @@ -243,10 +243,11 @@ function _field_info_collate_fields($reset = FALSE) { } cache_set('field_info_fields', $info, 'cache_field'); + $cached_info = $info; } } - return $info; + return $cached_info; } /** |