1 files changed, 5 insertions, 2 deletions
diff --git a/includes/module.inc b/includes/module.inc
index 408b3d718..be1f7fe9f 100644
--- a/includes/module.inc
+++ b/includes/module.inc
@@ -12,10 +12,10 @@ function module_iterate($function, $argument = "") {
 }
 
 // invoke hook $hook of module $name with optional arguments:
-function module_invoke($name, $hook, $a1 = NULL, $a2 = NULL) {
+function module_invoke($name, $hook, $a1 = NULL, $a2 = NULL, $a3 = NULL, $a4 = NULL) {
   $function = $name ."_". $hook;
   if (function_exists($function)) {
-    return $function($a1, $a2);
+    return $function($a1, $a2, $a3, $a4);
   }
 }
 
@@ -36,6 +36,9 @@ function module_list() {
       closedir($handle);
       asort($list);
     }
+    else {
+      $list = array();
+    }
   }
 
   return $list;