Index: modules/trigger/trigger.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/trigger/trigger.admin.inc,v retrieving revision 1.8 diff -u -r1.8 trigger.admin.inc --- modules/trigger/trigger.admin.inc 3 Feb 2009 18:55:32 -0000 1.8 +++ modules/trigger/trigger.admin.inc 17 Feb 2009 19:49:26 -0000 @@ -27,10 +27,12 @@ $output = ''; $hooks = module_invoke_all('hook_info'); foreach ($hooks as $module => $hook) { - if (isset($hook[$type])) { - foreach ($hook[$type] as $op => $description) { - $form_id = 'trigger_' . $type . '_' . $op . '_assign_form'; - $output .= drupal_get_form($form_id, $type, $op, $description['runs when']); + if ($module == $type) { + foreach ($hook as $hook_name => $hook_details) { + foreach ($hook_details as $op => $description) { + $form_id = 'trigger_'. $hook_name .'_'. $op .'_assign_form'; + $output .= drupal_get_form($form_id, $hook_name, $op, $description['runs when']); + } } } }