Index: modules/trigger/trigger.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/trigger/trigger.admin.inc,v
retrieving revision 1.13
diff -u -r1.13 modules/trigger/trigger.admin.inc
--- modules/trigger/trigger.admin.inc	29 Jun 2009 14:24:57 -0000	1.13
+++ modules/trigger/trigger.admin.inc	8 Jul 2009 01:59:03 -0000
@@ -24,10 +24,15 @@
   $build = array();
   $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';
-        $build[$form_id] = 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';
+          $build[$form_id] = drupal_get_form($form_id, $hook_name, $op, $description['runs when']);
+        }
       }
     }
   }