From 77d695fe56cb19cc7f6fc871b9fa5633856f25f2 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Wed, 28 Jun 2006 21:18:30 +0000
Subject: - Patch #69341 by chx: remove some SQL queries from the Drupal
 bootstrap process.

---
 includes/bootstrap.inc | 2 +-
 includes/module.inc    | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

(limited to 'includes')

diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index 946d926b4..0d8ed02ca 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -339,7 +339,7 @@ function page_get_cache() {
  *   The name of the bootstrap hook we wish to invoke.
  */
 function bootstrap_invoke_all($hook) {
-  foreach (module_list(FALSE, TRUE) as $module) {
+  foreach (module_list(TRUE, TRUE) as $module) {
     drupal_load('module', $module);
     module_invoke($module, $hook);
  }
diff --git a/includes/module.inc b/includes/module.inc
index b3c076250..03bc4f8a1 100644
--- a/includes/module.inc
+++ b/includes/module.inc
@@ -45,12 +45,8 @@ function module_list($refresh = FALSE, $bootstrap = TRUE, $sort = FALSE) {
   static $list, $sorted_list;
 
   if ($refresh) {
+    unset($sorted_list);
     $list = array();
-    $sorted_list = NULL;
-  }
-
-  if (!$list) {
-    $list = array('filter' => 'filter', 'node' => 'node', 'system' => 'system', 'user' => 'user', 'watchdog' => 'watchdog');
     if ($bootstrap) {
       $result = db_query("SELECT name, filename, throttle, bootstrap FROM {system} WHERE type = 'module' AND status = 1 AND bootstrap = 1 ORDER BY weight ASC, filename ASC");
     }
-- 
cgit v1.2.3