#707724 by chx: Rename confusing arguments in field/entity APIs.

2 files changed, 10 insertions, 10 deletions

diff --git a/modules/system/system.api.php b/modules/system/system.api.php
index 2245f4c6b..644f16b2a 100644
--- a/modules/system/system.api.php
+++ b/modules/system/system.api.php
@@ -1407,12 +1407,12 @@ function hook_mail($key, &$message, $params) {
     '%username' => format_username($account),
   );
   if ($context['hook'] == 'taxonomy') {
-    $object = $params['object'];
-    $vocabulary = taxonomy_vocabulary_load($object->vid);
+    $entity = $params['object'];
+    $vocabulary = taxonomy_vocabulary_load($entity->vid);
     $variables += array(
-      '%term_name' => $object->name,
-      '%term_description' => $object->description,
-      '%term_id' => $object->tid,
+      '%term_name' => $entity->name,
+      '%term_description' => $entity->description,
+      '%term_id' => $entity->tid,
       '%vocabulary_name' => $vocabulary->name,
       '%vocabulary_description' => $vocabulary->description,
       '%vocabulary_id' => $vocabulary->vid,
diff --git a/modules/system/system.module b/modules/system/system.module
index 606d6610d..96402841d 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -2848,9 +2848,9 @@ function system_send_email_action_submit($form, $form_state) {
 /**
  * Implements a configurable Drupal action: sends an email.
  */
-function system_send_email_action($object, $context) {
+function system_send_email_action($entity, $context) {
   if (empty($context['node'])) {
-    $context['node'] = $object;
+    $context['node'] = $entity;
   }
 
   $recipient = token_replace($context['recipient'], $context);
@@ -2898,9 +2898,9 @@ function system_message_action_submit($form, $form_state) {
 /**
  * A configurable Drupal action. Sends a message to the current user's screen.
  */
-function system_message_action(&$object, $context = array()) {
+function system_message_action(&$entity, $context = array()) {
   if (empty($context['node'])) {
-    $context['node'] = $object;
+    $context['node'] = $entity;
   }
 
   $context['message'] = token_replace($context['message'], $context);
@@ -2927,7 +2927,7 @@ function system_goto_action_submit($form, $form_state) {
   );
 }
 
-function system_goto_action($object, $context) {
+function system_goto_action($entity, $context) {
   drupal_goto(token_replace($context['url'], $context));
 }