diff options
Diffstat (limited to 'includes/module.inc')
| -rw-r--r-- | includes/module.inc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/includes/module.inc b/includes/module.inc index aa061e195..779b66826 100644 --- a/includes/module.inc +++ b/includes/module.inc @@ -1,5 +1,4 @@ <?php -// $Id$ /** * @file @@ -127,6 +126,9 @@ function system_list($type) { // if not fetch only the required information to fire bootstrap hooks // in case we are going to serve the page from cache. if ($type == 'bootstrap') { + if (isset($lists['bootstrap'])) { + return $lists['bootstrap']; + } if ($cached = cache_get('bootstrap_modules', 'cache_bootstrap')) { $bootstrap_list = $cached->data; } @@ -372,7 +374,7 @@ function module_enable($module_list, $enable_dependencies = TRUE) { // Add dependencies to the list, with a placeholder weight. // The new modules will be processed as the while loop continues. - foreach ($module_data[$module]->info['dependencies'] as $dependency) { + foreach (array_keys($module_data[$module]->requires) as $dependency) { if (!isset($module_list[$dependency])) { $module_list[$dependency] = 0; } @@ -854,7 +856,7 @@ function drupal_required_modules() { /** * Hands off alterable variables to type-specific *_alter implementations. * - * This dispatch function hands off the passed in variables to type-specific + * This dispatch function hands off the passed-in variables to type-specific * hook_TYPE_alter() implementations in modules. It ensures a consistent * interface for all altering operations. * @@ -888,14 +890,14 @@ function drupal_required_modules() { * values in $type. For example, when Form API is using drupal_alter() to * execute both hook_form_alter() and hook_form_FORM_ID_alter() * implementations, it passes array('form', 'form_' . $form_id) for $type. - * @param &$data + * @param $data * The variable that will be passed to hook_TYPE_alter() implementations to be * altered. The type of this variable depends on the value of the $type * argument. For example, when altering a 'form', $data will be a structured * array. When altering a 'profile', $data will be an object. - * @param &$context1 + * @param $context1 * (optional) An additional variable that is passed by reference. - * @param &$context2 + * @param $context2 * (optional) An additional variable that is passed by reference. If more * context needs to be provided to implementations, then this should be an * associative array as described above. |