diff options
| -rw-r--r-- | includes/bootstrap.inc | 4 | ||||
| -rw-r--r-- | includes/common.inc | 4 | ||||
| -rw-r--r-- | includes/module.inc | 4 | ||||
| -rw-r--r-- | includes/registry.inc | 4 | ||||
| -rw-r--r-- | includes/theme.inc | 2 | ||||
| -rw-r--r-- | modules/system/system.admin.inc | 4 | ||||
| -rw-r--r-- | modules/system/system.install | 2 | ||||
| -rw-r--r-- | modules/system/system.module | 2 |
8 files changed, 13 insertions, 13 deletions
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc index 06a154197..8fb6aff37 100644 --- a/includes/bootstrap.inc +++ b/includes/bootstrap.inc @@ -1325,9 +1325,9 @@ function registry_mark_code($type, $name, $return = FALSE) { * Rescans all code in modules or includes directory, storing a mapping of * each function, file, and hook implementation in the database. */ -function drupal_rebuild_code_registry() { +function registry_rebuild() { require_once './includes/registry.inc'; - _drupal_rebuild_code_registry(); + _registry_rebuild(); } /** diff --git a/includes/common.inc b/includes/common.inc index 46dba975d..b5a2b4bba 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -3548,11 +3548,11 @@ function drupal_flush_all_caches() { // Change query-strings on css/js files to enforce reload for all users. _drupal_flush_css_js(); - drupal_rebuild_code_registry(); + registry_rebuild(); drupal_clear_css_cache(); drupal_clear_js_cache(); system_theme_data(); - drupal_rebuild_theme_registry(); + drupal_theme_rebuild(); menu_rebuild(); node_types_rebuild(); // Don't clear cache_form - in-progress form submissions may break. diff --git a/includes/module.inc b/includes/module.inc index 79b12c3d7..ae7667370 100644 --- a/includes/module.inc +++ b/includes/module.inc @@ -284,7 +284,7 @@ function module_enable($module_list) { // Refresh the module list to include the new enabled module. module_list(TRUE, FALSE); // Force to regenerate the stored list of hook implementations. - drupal_rebuild_code_registry(); + registry_rebuild(); } foreach ($invoke_modules as $module) { @@ -325,7 +325,7 @@ function module_disable($module_list) { // Refresh the module list to exclude the disabled modules. module_list(TRUE, FALSE); // Force to regenerate the stored list of hook implementations. - drupal_rebuild_code_registry(); + registry_rebuild(); } // If there remains no more node_access module, rebuilding will be diff --git a/includes/registry.inc b/includes/registry.inc index 5250a0226..213e03bc5 100644 --- a/includes/registry.inc +++ b/includes/registry.inc @@ -20,9 +20,9 @@ */ /** - * @See drupal_rebuild_code_registry. + * @see registry_rebuild. */ -function _drupal_rebuild_code_registry() { +function _registry_rebuild() { // Reset the resources cache. _registry_get_resource_name(); // Get the list of files we are going to parse. diff --git a/includes/theme.inc b/includes/theme.inc index 424cde1c0..de11a1416 100644 --- a/includes/theme.inc +++ b/includes/theme.inc @@ -256,7 +256,7 @@ function _theme_save_registry($theme, $registry) { * when modules are added to the system, or when a dynamic system needs * to add more theme hooks. */ -function drupal_rebuild_theme_registry() { +function drupal_theme_rebuild() { cache_clear_all('theme_registry', 'cache', TRUE); } diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc index b2af36054..a28f96074 100644 --- a/modules/system/system.admin.inc +++ b/modules/system/system.admin.inc @@ -290,7 +290,7 @@ function system_themes_form_submit($form, &$form_state) { list_themes(TRUE); menu_rebuild(); - drupal_rebuild_theme_registry(); + drupal_theme_rebuild(); drupal_set_message(t('The configuration options have been saved.')); $form_state['redirect'] = 'admin/build/themes'; @@ -606,7 +606,7 @@ function _system_is_incompatible(&$incompatible, $files, $file) { */ function system_modules($form_state = array()) { // Clear all caches. - drupal_rebuild_theme_registry(); + drupal_theme_rebuild(); node_types_rebuild(); menu_rebuild(); cache_clear_all('schema', 'cache'); diff --git a/modules/system/system.install b/modules/system/system.install index ec85200ae..12410bc3a 100644 --- a/modules/system/system.install +++ b/modules/system/system.install @@ -2959,7 +2959,7 @@ function system_update_7006() { db_create_table($ret, 'cache_registry', $schema['cache_registry']); db_create_table($ret, 'registry', $schema['registry']); db_create_table($ret, 'registry_file', $schema['registry_file']); - drupal_rebuild_code_registry(); + registry_rebuild(); return $ret; } diff --git a/modules/system/system.module b/modules/system/system.module index a5b199771..9b79eb9e5 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -1224,7 +1224,7 @@ function system_settings_form_submit($form, &$form_state) { } cache_clear_all(); - drupal_rebuild_theme_registry(); + drupal_theme_rebuild(); } /** |