Commit 4fca5a64 authored by Dries's avatar Dries

- Patch #645468 by sun: filter module no longer needs to be loaded by default.

parent 19c4f88c
......@@ -40,10 +40,8 @@ function _drupal_maintenance_theme() {
// Because we are operating in a crippled environment, we need to
// bootstrap just enough to allow hook invocations to work.
$module_list['system']['filename'] = 'modules/system/system.module';
$module_list['filter']['filename'] = 'modules/filter/filter.module';
module_list(TRUE, FALSE, FALSE, $module_list);
drupal_load('module', 'system');
drupal_load('module', 'filter');
}
$custom_theme = variable_get('maintenance_theme', 'minnelli');
......
......@@ -251,11 +251,9 @@ function install_begin_request(&$install_state) {
include_once DRUPAL_ROOT . '/includes/entity.inc';
$module_list['system']['filename'] = 'modules/system/system.module';
$module_list['filter']['filename'] = 'modules/filter/filter.module';
$module_list['user']['filename'] = 'modules/user/user.module';
module_list(TRUE, FALSE, FALSE, $module_list);
drupal_load('module', 'system');
drupal_load('module', 'filter');
drupal_load('module', 'user');
// Load the cache infrastructure using a "fake" cache implementation that
......
......@@ -311,10 +311,8 @@ function update_check_requirements() {
// Load module basics.
include_once DRUPAL_ROOT . '/includes/module.inc';
$module_list['system']['filename'] = 'modules/system/system.module';
$module_list['filter']['filename'] = 'modules/filter/filter.module';
module_list(TRUE, FALSE, FALSE, $module_list);
drupal_load('module', 'system');
drupal_load('module', 'filter');
// Reset the module_implements() cache so that any new hook implementations
// in updated code are picked up.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment