' . st('Congratulations, you installed @drupal!', array('@drupal' => drupal_install_profile_distribution_name())) . '
'; $output .= '' . (isset($messages['error']) ? st('Review the messages above before visiting your new site.', array('@url' => url(''))) : st('Visit your new site.', array('@url' => url('')))) . '
'; - // Rebuild the module and theme data, in case any newly-installed modules - // need to modify it via hook_system_info_alter(). We need to clear the - // theme static cache first, to make sure that the theme data is actually - // rebuilt. - drupal_static_reset('_system_rebuild_theme_data'); - system_rebuild_module_data(); - system_rebuild_theme_data(); - // Flush all caches to ensure that any full bootstraps during the installer // do not leave stale cached data, and that any content types or other items // registered by the install profile are registered correctly. Index: includes/module.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/module.inc,v retrieving revision 1.176 diff -u -p -r1.176 module.inc --- includes/module.inc 2 Dec 2009 00:17:49 -0000 1.176 +++ includes/module.inc 9 Dec 2009 03:45:55 -0000 @@ -315,13 +315,20 @@ function module_enable($module_list, $di } if (!empty($invoke_modules)) { - // Refresh the module list to exclude the disabled modules. + // Refresh the module list to exclude the newly-enabled modules. system_list_reset(); module_list(TRUE); module_implements('', FALSE, TRUE); - // Force to regenerate the stored list of hook implementations. + // Rebuild the module and theme data, in case any newly-enabled modules + // need to modify it via hook_system_info_alter(). + system_rebuild_module_data(); + system_rebuild_theme_data(); + // Force the theme registry to be rebuilt, in case any newly-enabled + // modules have theme process or preprocess functions that need to run. + drupal_theme_rebuild(); + // Regenerate the stored list of interfaces and classes. registry_rebuild(); - // Refresh the schema to include the new enabled module. + // Refresh the schema to include the newly-enabled modules. drupal_get_schema(NULL, TRUE); // If any modules were newly installed, execute the hook for them. Index: modules/system/system.module =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.module,v retrieving revision 1.857 diff -u -p -r1.857 system.module --- modules/system/system.module 6 Dec 2009 01:00:27 -0000 1.857 +++ modules/system/system.module 9 Dec 2009 03:45:55 -0000 @@ -2217,128 +2217,121 @@ function system_rebuild_module_data() { * An associative array of themes information. */ function _system_rebuild_theme_data() { - $themes_info = &drupal_static(__FUNCTION__, array()); - - if (empty($themes_info)) { - // Find themes - $themes = drupal_system_listing('/\.info$/', 'themes'); - // Find theme engines - $engines = drupal_system_listing('/\.engine$/', 'themes/engines'); - - // Set defaults for theme info. - $defaults = array( - 'regions' => array( - 'sidebar_first' => 'Left sidebar', - 'sidebar_second' => 'Right sidebar', - 'content' => 'Content', - 'header' => 'Header', - 'footer' => 'Footer', - 'highlight' => 'Highlighted content', - 'help' => 'Help', - 'page_top' => 'Page top', - 'page_bottom' => 'Page bottom', - ), - 'description' => '', - 'features' => array( - 'comment_user_picture', - 'comment_user_verification', - 'favicon', - 'logo', - 'name', - 'node_user_picture', - 'slogan', - 'main_menu', - 'secondary_menu', - ), - 'screenshot' => 'screenshot.png', - 'php' => DRUPAL_MINIMUM_PHP, - ); - - $sub_themes = array(); - // Read info files for each theme - foreach ($themes as $key => $theme) { - $themes[$key]->filename = $theme->uri; - $themes[$key]->info = drupal_parse_info_file($theme->uri) + $defaults; - - // Invoke hook_system_info_alter() to give installed modules a chance to - // modify the data in the .info files if necessary. - $type = 'theme'; - drupal_alter('system_info', $themes[$key]->info, $themes[$key], $type); + // Find themes + $themes = drupal_system_listing('/\.info$/', 'themes'); + // Find theme engines + $engines = drupal_system_listing('/\.engine$/', 'themes/engines'); + + // Set defaults for theme info. + $defaults = array( + 'regions' => array( + 'sidebar_first' => 'Left sidebar', + 'sidebar_second' => 'Right sidebar', + 'content' => 'Content', + 'header' => 'Header', + 'footer' => 'Footer', + 'highlight' => 'Highlighted content', + 'help' => 'Help', + 'page_top' => 'Page top', + 'page_bottom' => 'Page bottom', + ), + 'description' => '', + 'features' => array( + 'comment_user_picture', + 'comment_user_verification', + 'favicon', + 'logo', + 'name', + 'node_user_picture', + 'slogan', + 'main_menu', + 'secondary_menu', + ), + 'screenshot' => 'screenshot.png', + 'php' => DRUPAL_MINIMUM_PHP, + ); - if (!empty($themes[$key]->info['base theme'])) { - $sub_themes[] = $key; - } - if (empty($themes[$key]->info['engine'])) { - $filename = dirname($themes[$key]->uri) . '/' . $themes[$key]->name . '.theme'; - if (file_exists($filename)) { - $themes[$key]->owner = $filename; - $themes[$key]->prefix = $key; - } + $sub_themes = array(); + // Read info files for each theme + foreach ($themes as $key => $theme) { + $themes[$key]->filename = $theme->uri; + $themes[$key]->info = drupal_parse_info_file($theme->uri) + $defaults; + // Invoke hook_system_info_alter() to give installed modules a chance to + // modify the data in the .info files if necessary. + $type = 'theme'; + drupal_alter('system_info', $themes[$key]->info, $themes[$key], $type); + + if (!empty($themes[$key]->info['base theme'])) { + $sub_themes[] = $key; + } + if (empty($themes[$key]->info['engine'])) { + $filename = dirname($themes[$key]->uri) . '/' . $themes[$key]->name . '.theme'; + if (file_exists($filename)) { + $themes[$key]->owner = $filename; + $themes[$key]->prefix = $key; } - else { - $engine = $themes[$key]->info['engine']; - if (isset($engines[$engine])) { - $themes[$key]->owner = $engines[$engine]->uri; - $themes[$key]->prefix = $engines[$engine]->name; - $themes[$key]->template = TRUE; - } + } + else { + $engine = $themes[$key]->info['engine']; + if (isset($engines[$engine])) { + $themes[$key]->owner = $engines[$engine]->uri; + $themes[$key]->prefix = $engines[$engine]->name; + $themes[$key]->template = TRUE; } + } - // Give the stylesheets proper path information. - $pathed_stylesheets = array(); - if (isset($themes[$key]->info['stylesheets'])) { - foreach ($themes[$key]->info['stylesheets'] as $media => $stylesheets) { - foreach ($stylesheets as $stylesheet) { - $pathed_stylesheets[$media][$stylesheet] = dirname($themes[$key]->uri) . '/' . $stylesheet; - } + // Give the stylesheets proper path information. + $pathed_stylesheets = array(); + if (isset($themes[$key]->info['stylesheets'])) { + foreach ($themes[$key]->info['stylesheets'] as $media => $stylesheets) { + foreach ($stylesheets as $stylesheet) { + $pathed_stylesheets[$media][$stylesheet] = dirname($themes[$key]->uri) . '/' . $stylesheet; } } - $themes[$key]->info['stylesheets'] = $pathed_stylesheets; + } + $themes[$key]->info['stylesheets'] = $pathed_stylesheets; - // Give the scripts proper path information. - $scripts = array(); - if (isset($themes[$key]->info['scripts'])) { - foreach ($themes[$key]->info['scripts'] as $script) { - $scripts[$script] = dirname($themes[$key]->uri) . '/' . $script; - } - } - $themes[$key]->info['scripts'] = $scripts; - // Give the screenshot proper path information. - if (!empty($themes[$key]->info['screenshot'])) { - $themes[$key]->info['screenshot'] = dirname($themes[$key]->uri) . '/' . $themes[$key]->info['screenshot']; + // Give the scripts proper path information. + $scripts = array(); + if (isset($themes[$key]->info['scripts'])) { + foreach ($themes[$key]->info['scripts'] as $script) { + $scripts[$script] = dirname($themes[$key]->uri) . '/' . $script; } } + $themes[$key]->info['scripts'] = $scripts; + // Give the screenshot proper path information. + if (!empty($themes[$key]->info['screenshot'])) { + $themes[$key]->info['screenshot'] = dirname($themes[$key]->uri) . '/' . $themes[$key]->info['screenshot']; + } + } - // Now that we've established all our master themes, go back and fill in - // data for subthemes. - foreach ($sub_themes as $key) { - $themes[$key]->base_themes = system_find_base_themes($themes, $key); - // Don't proceed if there was a problem with the root base theme. - if (!current($themes[$key]->base_themes)) { - continue; - } - $base_key = key($themes[$key]->base_themes); - foreach (array_keys($themes[$key]->base_themes) as $base_theme) { - $themes[$base_theme]->sub_themes[$key] = $themes[$key]->info['name']; + // Now that we've established all our master themes, go back and fill in + // data for subthemes. + foreach ($sub_themes as $key) { + $themes[$key]->base_themes = system_find_base_themes($themes, $key); + // Don't proceed if there was a problem with the root base theme. + if (!current($themes[$key]->base_themes)) { + continue; + } + $base_key = key($themes[$key]->base_themes); + foreach (array_keys($themes[$key]->base_themes) as $base_theme) { + $themes[$base_theme]->sub_themes[$key] = $themes[$key]->info['name']; + } + // Copy the 'owner' and 'engine' over if the top level theme uses a theme + // theme engine. + if (isset($themes[$base_key]->owner)) { + if (isset($themes[$base_key]->info['engine'])) { + $themes[$key]->info['engine'] = $themes[$base_key]->info['engine']; + $themes[$key]->owner = $themes[$base_key]->owner; + $themes[$key]->prefix = $themes[$base_key]->prefix; } - // Copy the 'owner' and 'engine' over if the top level theme uses a - // theme engine. - if (isset($themes[$base_key]->owner)) { - if (isset($themes[$base_key]->info['engine'])) { - $themes[$key]->info['engine'] = $themes[$base_key]->info['engine']; - $themes[$key]->owner = $themes[$base_key]->owner; - $themes[$key]->prefix = $themes[$base_key]->prefix; - } - else { - $themes[$key]->prefix = $key; - } + else { + $themes[$key]->prefix = $key; } } - - $themes_info = $themes; } - return $themes_info; + return $themes; } /** @@ -2352,6 +2345,9 @@ function system_rebuild_theme_data() { ksort($themes); system_get_files_database($themes, 'theme'); system_update_files_database($themes, 'theme'); + // Before returning, reset the system_list() cache, since it stores the + // contents of theme .info files which may now be out of date. + system_list_reset(); return $themes; } Index: modules/system/system.updater.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.updater.inc,v retrieving revision 1.2 diff -u -p -r1.2 system.updater.inc --- modules/system/system.updater.inc 27 Oct 2009 04:08:41 -0000 1.2 +++ modules/system/system.updater.inc 9 Dec 2009 03:45:55 -0000 @@ -117,7 +117,6 @@ class ThemeUpdater extends Updater imple public function postInstall() { // Update the system table. clearstatcache(); - drupal_static_reset('_system_rebuild_theme_data'); _system_rebuild_theme_data(); // Active the theme