- Patch #615484 by yched: remove schema rebuild from field_cache_clear().

2 files changed, 4 insertions, 12 deletions

diff --git a/modules/field/field.module b/modules/field/field.module
index d4c0050c9..708677bdc 100644
--- a/modules/field/field.module
+++ b/modules/field/field.module
@@ -426,21 +426,11 @@ function _field_extra_weights_pre_render($elements) {
 }
 
 /**
- * Clear the cached information; called in several places when field
- * information is changed.
+ * Clear the field info and field date caches.
  */
-function field_cache_clear($rebuild_schema = FALSE) {
+function field_cache_clear() {
   cache_clear_all('*', 'cache_field', TRUE);
-
-  module_load_include('inc', 'field', 'field.info');
   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
-  // we refresh the schema...
-  if ($rebuild_schema) {
-    $schema = drupal_get_schema(NULL, TRUE);
-  }
 }
 
 /**
diff --git a/modules/field/modules/field_sql_storage/field_sql_storage.module b/modules/field/modules/field_sql_storage/field_sql_storage.module
index 6320dd791..84df0a4ac 100644
--- a/modules/field/modules/field_sql_storage/field_sql_storage.module
+++ b/modules/field/modules/field_sql_storage/field_sql_storage.module
@@ -213,6 +213,7 @@ function field_sql_storage_field_storage_create_field($field) {
   foreach ($schema as $name => $table) {
     db_create_table($name, $table);
   }
+  drupal_get_schema(NULL, TRUE);
 }
 
 /**
@@ -269,6 +270,7 @@ function field_sql_storage_field_storage_update_field($field, $prior_field, $has
       }
     }
   }
+  drupal_get_schema(NULL, TRUE);
 }
 
 /**