Index: modules/simpletest/tests/actions.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/actions.test,v
retrieving revision 1.16
diff -u -p -r1.16 actions.test
--- modules/simpletest/tests/actions.test	26 May 2010 11:26:49 -0000	1.16
+++ modules/simpletest/tests/actions.test	7 Jun 2010 06:51:38 -0000
@@ -21,15 +21,15 @@ class ActionsConfigurationTestCase exten
 
     // Make a POST request to admin/config/system/actions/manage.
     $edit = array();
-    $edit['action'] = drupal_hash_base64('system_goto_action');
+    $edit['action'] = drupal_hash_base64('system_message_action');
     $this->drupalPost('admin/config/system/actions/manage', $edit, t('Create'));
 
     // Make a POST request to the individual action configuration page.
     $edit = array();
     $action_label = $this->randomName();
     $edit['actions_label'] = $action_label;
-    $edit['url'] = 'admin';
-    $this->drupalPost('admin/config/system/actions/configure/' . drupal_hash_base64('system_goto_action'), $edit, t('Save'));
+    $edit['message'] = $this->randomName();
+    $this->drupalPost('admin/config/system/actions/configure/' . drupal_hash_base64('system_message_action'), $edit, t('Save'));
 
     // Make sure that the new complex action was saved properly.
     $this->assertText(t('The action has been successfully saved.'), t("Make sure we get a confirmation that we've successfully saved the complex action."));
@@ -42,7 +42,7 @@ class ActionsConfigurationTestCase exten
     $edit = array();
     $new_action_label = $this->randomName();
     $edit['actions_label'] = $new_action_label;
-    $edit['url'] = 'admin';
+    $edit['message'] = $this->randomName();
     $this->drupalPost(NULL, $edit, t('Save'));
 
     // Make sure that the action updated properly.
@@ -59,7 +59,7 @@ class ActionsConfigurationTestCase exten
     $this->assertRaw(t('Action %action was deleted', array('%action' => $new_action_label)), t('Make sure that we get a delete confirmation message.'));
     $this->drupalGet('admin/config/system/actions/manage');
     $this->assertNoText($new_action_label, t("Make sure the action label does not appear on the overview page after we've deleted the action."));
-    $exists = db_query('SELECT aid FROM {actions} WHERE callback = :callback', array(':callback' => 'drupal_goto_action'))->fetchField();
+    $exists = db_query('SELECT aid FROM {actions} WHERE callback = :callback', array(':callback' => 'drupal_message_action'))->fetchField();
     $this->assertFalse($exists, t('Make sure the action is gone from the database after being deleted.'));
   }
 }
Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.933
diff -u -p -r1.933 system.module
--- modules/system/system.module	20 May 2010 08:47:00 -0000	1.933
+++ modules/system/system.module	7 Jun 2010 06:51:39 -0000
@@ -2873,12 +2873,6 @@ function system_action_info() {
       'configurable' => FALSE,
       'triggers' => array(),
     ),
-    'system_goto_action' => array(
-      'type' => 'system',
-      'label' => t('Redirect to URL'),
-      'configurable' => TRUE,
-      'triggers' => array('any'),
-    ),
   );
 }
 
@@ -3057,43 +3051,6 @@ function system_message_action(&$entity,
 }
 
 /**
- * Settings form for system_goto_action().
- */
-function system_goto_action_form($context) {
-  $form['url'] = array(
-    '#type' => 'textfield',
-    '#title' => t('URL'),
-    '#description' => t('The URL to which the user should be redirected. This can be an internal URL like node/1234 or an external URL like http://drupal.org.'),
-    '#default_value' => isset($context['url']) ? $context['url'] : '',
-    '#required' => TRUE,
-  );
-  return $form;
-}
-
-function system_goto_action_submit($form, $form_state) {
-  return array(
-    'url' => $form_state['values']['url']
-  );
-}
-
-/**
- * Redirects to a different URL.
- *
- * @param $entity
- *   Ignored.
- * @param array $context
- *   Array with the following elements:
- *   - 'url': URL to redirect to. This will be passed through
- *     token_replace().
- *   - Other elements will be used as the data for token replacement.
- *
- * @ingroup actions
- */
-function system_goto_action($entity, $context) {
-  drupal_goto(token_replace($context['url'], $context));
-}
-
-/**
  * Blocks the current user's IP address.
  *
  * @ingroup actions