Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
project
drupal
Commits
e218e24a
Commit
e218e24a
authored
Nov 13, 2009
by
Dries Buytaert
Browse files
- Rollback of
#631486
(wrong incomplete commit)
parent
a6ae1c6c
Changes
1
Hide whitespace changes
Inline
Side-by-side
modules/field/field.info.inc
View file @
e218e24a
...
...
@@ -64,12 +64,12 @@ function _field_info_collate_types($reset = FALSE) {
if
(
$reset
)
{
$info
=
NULL
;
cache_clear_all
(
'field_info_types'
,
'cache_
bootstrap
'
);
cache_clear_all
(
'field_info_types'
,
'cache_
field
'
);
return
;
}
if
(
!
isset
(
$info
))
{
if
(
$cached
=
cache_get
(
'field_info_types'
,
'cache_
bootstrap
'
))
{
if
(
$cached
=
cache_get
(
'field_info_types'
,
'cache_
field
'
))
{
$info
=
$cached
->
data
;
}
else
{
...
...
@@ -137,7 +137,7 @@ function _field_info_collate_types($reset = FALSE) {
}
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
)
{
$info
=
NULL
;
cache_clear_all
(
'field_info_fields'
,
'cache_field
_bootstrap
'
);
cache_clear_all
(
'field_info_fields'
,
'cache_field'
);
return
;
}
if
(
!
isset
(
$info
))
{
if
(
$cached
=
cache_get
(
'field_info_fields'
,
'cache_
bootstrap
'
))
{
if
(
$cached
=
cache_get
(
'field_info_fields'
,
'cache_
field
'
))
{
$definitions
=
$cached
->
data
;
}
else
{
...
...
@@ -181,7 +181,7 @@ function _field_info_collate_fields($reset = FALSE) {
'field_ids'
=>
field_read_fields
(
array
(),
array
(
'include_deleted'
=>
1
)),
'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.
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment