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

Issue #1400256 by MiSc, vlkff, populist: Fixed ['fields'], not always set?.

merge-requests/26/head
webchick 2012-07-07 13:32:51 -07:00
parent b7ad8c6c9b
commit 1246bbcb82
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;
}
/**