summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2008-08-02 19:01:02 +0000
committerDries Buytaert <dries@buytaert.net>2008-08-02 19:01:02 +0000
commit6c1068e48d1d0fcde3afb9b5ecf34df39350acb8 (patch)
tree18608fa197fdba0c0b7a82d6c9cfe66cc51d4c8a /includes
parent9cec02e4728f27eeb21c43c37633c819d379ddeb (diff)
downloadbrdo-6c1068e48d1d0fcde3afb9b5ecf34df39350acb8.tar.gz
brdo-6c1068e48d1d0fcde3afb9b5ecf34df39350acb8.tar.bz2
- Patch #287877 by dmitrig01: rename drupal_rebuild_code_registry() to registry_rebuild() for consistency.
Diffstat (limited to 'includes')
-rw-r--r--includes/bootstrap.inc4
-rw-r--r--includes/common.inc4
-rw-r--r--includes/module.inc4
-rw-r--r--includes/registry.inc4
-rw-r--r--includes/theme.inc2
5 files changed, 9 insertions, 9 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);
}