diff options
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/module.inc | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/includes/module.inc b/includes/module.inc index 030bdeea2..d908ceb25 100644 --- a/includes/module.inc +++ b/includes/module.inc @@ -11,7 +11,9 @@ function module_init() { // apply function $function to every known module: function module_iterate($function, $argument = "") { - foreach (module_list() as $name) $function($name, $argument); + foreach (module_list() as $name) { + $function($name, $argument); + } } // invoke hook $hook of module $name with optional arguments: @@ -45,8 +47,8 @@ function module_list() { $list = array("drupal" => "drupal", "system" => "system", "user" => "user", "watchdog" => "watchdog"); $result = db_query("SELECT name, filename FROM system WHERE type = 'module' AND status = '1' ORDER BY name"); while ($module = db_fetch_object($result)) { - $list[$module->name] = $module->name; if (file_exists("modules/$module->filename")) { + $list[$module->name] = $module->name; include_once "modules/$module->filename"; } } @@ -88,23 +90,4 @@ function module_rehash_blocks($name) { db_query("DELETE FROM blocks WHERE module = '$name' AND remove = '1'"); } -// rehash a module: -function module_rehash($name) { - if (module_exist($name)) { - $result = db_query("SELECT * FROM modules WHERE name = '$name'"); - - if (!$object = db_fetch_object($result)) { - db_query("INSERT INTO modules (name) VALUES ('$name')"); - } - - // rehash module-exported blocks (if necessary): - module_rehash_blocks($name); - } - else { - // remove all reference to module: - db_query("DELETE FROM modules WHERE name = '$name'"); - db_query("DELETE FROM blocks WHERE module = '$name'"); - } -} - ?>
\ No newline at end of file |