- Patch #570218 by yched: viewing 'Manage fields' page clears field data cache.

4 files changed, 5 insertions, 7 deletions

diff --git a/modules/field/field.crud.inc b/modules/field/field.crud.inc
index f559e8536..cae2ecdf5 100644
--- a/modules/field/field.crud.inc
+++ b/modules/field/field.crud.inc
@@ -870,7 +870,7 @@ function field_purge_instance($instance) {
   module_invoke(variable_get('field_storage_module', 'field_sql_storage'), 'field_storage_purge_instance', $instance);
 
   // Clear the cache.
-  _field_info_cache_clear();
+  field_info_cache_clear();
 
   // Invoke external hooks after the cache is cleared for API consistency.
   module_invoke_all('field_purge_instance', $instance);
@@ -899,7 +899,7 @@ function field_purge_field($field) {
   module_invoke(variable_get('field_storage_module', 'field_sql_storage'), 'field_storage_purge_field', $field);
 
   // Clear the cache.
-  _field_info_cache_clear();
+  field_info_cache_clear();
 
   // Invoke external hooks after the cache is cleared for API consistency.
   module_invoke_all('field_purge_field', $field);
diff --git a/modules/field/field.info.inc b/modules/field/field.info.inc
index 99660f0da..aa5b4d08b 100644
--- a/modules/field/field.info.inc
+++ b/modules/field/field.info.inc
@@ -23,7 +23,7 @@
  * need to remove the purged records, but no actual field data items
  * are affected.
  */
-function _field_info_cache_clear() {
+function field_info_cache_clear() {
   _field_info_collate_types(TRUE);
   drupal_static_reset('field_build_modes');
   _field_info_collate_fields(TRUE);
diff --git a/modules/field/field.module b/modules/field/field.module
index 913c26974..05ebb8488 100644
--- a/modules/field/field.module
+++ b/modules/field/field.module
@@ -421,7 +421,7 @@ function field_cache_clear($rebuild_schema = FALSE) {
   cache_clear_all('*', 'cache_field', TRUE);
 
   module_load_include('inc', 'field', 'field.info');
-  _field_info_cache_clear();
+  field_info_cache_clear();
 
   // Refresh the schema to pick up new information.
   // TODO : if db storage gets abstracted out, we'll need to revisit how and when
diff --git a/modules/field_ui/field_ui.admin.inc b/modules/field_ui/field_ui.admin.inc
index 05102daa1..759e53920 100644
--- a/modules/field_ui/field_ui.admin.inc
+++ b/modules/field_ui/field_ui.admin.inc
@@ -73,7 +73,7 @@ function field_ui_field_overview_form(&$form_state, $obj_type, $bundle) {
 
   // When displaying the form, make sure the list of fields is up-to-date.
   if (empty($form_state['post'])) {
-    field_cache_clear();
+    field_info_cache_clear();
   }
 
   // Gather bundle information.
@@ -542,8 +542,6 @@ function field_ui_field_overview_form_submit($form, &$form_state) {
     unset($_REQUEST['destination']);
     $form_state['redirect'] = field_ui_get_destinations($destinations);
   }
-
-  field_cache_clear();
 }
 
 /**