1 files changed, 4 insertions, 7 deletions
diff --git a/modules/trigger/trigger.admin.inc b/modules/trigger/trigger.admin.inc
index 5a33b6249..7d6c2621e 100644
--- a/modules/trigger/trigger.admin.inc
+++ b/modules/trigger/trigger.admin.inc
@@ -20,9 +20,6 @@ function trigger_assign($type = NULL) {
   if (!isset($type)) {
     drupal_goto('admin/build/trigger/node');
   }
-  if ($type == 'node') {
-    $type = 'nodeapi';
-  }
 
   $output = '';
   $hooks = module_invoke_all('hook_info');
@@ -68,7 +65,7 @@ function trigger_unassign($form_state, $hook = NULL, $op = NULL, $aid = NULL) {
   $action = actions_function_lookup($aid);
   $actions = actions_get_all_actions();
 
-  $destination = 'admin/build/trigger/' . ($hook == 'nodeapi' ? 'node' : $hook);
+  $destination = 'admin/build/trigger/' . ($hook == 'node' ? 'node' : $hook);
 
   return confirm_form($form,
     t('Are you sure you want to unassign the action %title?', array('%title' => $actions[$action]['description'])),
@@ -86,7 +83,7 @@ function trigger_unassign_submit($form, &$form_state) {
     $actions = actions_get_all_actions();
     watchdog('actions', 'Action %action has been unassigned.',  array('%action' => check_plain($actions[$aid]['description'])));
     drupal_set_message(t('Action %action has been unassigned.', array('%action' => $actions[$aid]['description'])));
-    $hook = $form_values['hook'] == 'nodeapi' ? 'node' : $form_values['hook'];
+    $hook = $form_values['hook'] == 'node' ? 'node' : $form_values['hook'];
     $form_state['redirect'] = 'admin/build/trigger/' . $hook;
   }
   else {
@@ -100,7 +97,7 @@ function trigger_unassign_submit($form, &$form_state) {
  * @param $form_state
  *   Information about the current form.
  * @param $hook
- *   The name of the hook, e.g., 'nodeapi'.
+ *   The name of the hook, e.g., 'node'.
  * @param $op
  *   The name of the hook operation, e.g., 'insert'.
  * @param $description
@@ -263,7 +260,7 @@ function theme_trigger_display($element) {
  *   One of 'node', 'user', 'comment'.
  * @param $hook
  *   The name of the hook for which actions have been assigned,
- *   e.g. 'nodeapi'.
+ *   e.g. 'node'.
  * @param $op
  *   The hook operation for which the actions have been assigned,
  *   e.g., 'view'.