Rollback some of the changes from r20822. But still pull the

determination of the function name and arguments to outside 
the module loop

1 files changed, 3 insertions, 3 deletions

diff --git a/core/helpers/module.php b/core/helpers/module.php
index 7e483fb9..ca5af3fc 100644
--- a/core/helpers/module.php
+++ b/core/helpers/module.php
@@ -167,10 +167,10 @@ class module_Core {
    * Run a specific event on all active modules.
    * @param string $name the event name
    * @param mixed  $data data to pass to each event handler
-   * @param mixed  $data2 data to pass to each event handler
    */
-  static function event($name, &$data=null, &$data2=null) {
-    $args = empty($data2) ? array(&$data) : array(&$data, &$data2);
+  static function event($name, &$data=null) {
+    $args = func_get_args();
+    array_shift($args);
     $function = str_replace(".", "_", $name);
 
     foreach (self::installed() as $module) {