From c2b82b6c8ca2bdc1d65a0338d2be3fb40bc8ef34 Mon Sep 17 00:00:00 2001
From: webchick <webchick@24967.no-reply.drupal.org>
Date: Fri, 30 Sep 2011 13:17:42 -0700
Subject: [PATCH] Issue #1177738 by catch: Speed up theme registry rebuilds
when multiple themes are enabled.
---
includes/theme.inc | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/includes/theme.inc b/includes/theme.inc
index b85a35cfb562..5fe6cddc8590 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -512,7 +512,7 @@ function _theme_process_registry(&$cache, $name, $type, $theme, $path) {
}
/**
- * Rebuild the theme registry cache.
+ * Build the theme registry cache.
*
* @param $theme
* The loaded $theme object as returned by list_themes().
@@ -525,9 +525,20 @@ function _theme_process_registry(&$cache, $name, $type, $theme, $path) {
function _theme_build_registry($theme, $base_theme, $theme_engine) {
$cache = array();
// First, process the theme hooks advertised by modules. This will
- // serve as the basic registry.
- foreach (module_implements('theme') as $module) {
- _theme_process_registry($cache, $module, 'module', $module, drupal_get_path('module', $module));
+ // serve as the basic registry. Since the list of enabled modules is the same
+ // regardless of the theme used, this is cached in its own entry to save
+ // building it for every theme.
+ if ($cached = cache_get('theme_registry:build:modules')) {
+ $cache = $cached->data;
+ }
+ else {
+ foreach (module_implements('theme') as $module) {
+ _theme_process_registry($cache, $module, 'module', $module, drupal_get_path('module', $module));
+ }
+ // Only cache this registry if all modules are loaded.
+ if (module_load_all(NULL)) {
+ cache_set('theme_registry:build:modules', $cache);
+ }
}
// Process each base theme.
--
GitLab