From 7562a8efb36306e96bf4d13b1f97b4573809ab45 Mon Sep 17 00:00:00 2001
From: Angie Byron <webchick@24967.no-reply.drupal.org>
Date: Thu, 11 Feb 2010 17:44:47 +0000
Subject: #707724 by chx: Rename confusing arguments in field/entity APIs.

---
 modules/node/node.install | 2 +-
 modules/node/node.module  | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'modules/node')

diff --git a/modules/node/node.install b/modules/node/node.install
index f099fffb1..b4eeaeab6 100644
--- a/modules/node/node.install
+++ b/modules/node/node.install
@@ -427,7 +427,7 @@ function node_update_7004() {
   $type_list = node_type_get_types();
 
   // Apply original settings to all types.
-  foreach ($type_list as $type => $object) {
+  foreach ($type_list as $type => $entity) {
     variable_set('teaser_length_' . $type, $original_length);
     variable_set('node_preview_' . $type, $original_preview);
   }
diff --git a/modules/node/node.module b/modules/node/node.module
index 6b5265b25..3c556914b 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -2519,8 +2519,8 @@ function node_form_search_form_alter(&$form, $form_state) {
 
     // Languages:
     $language_options = array();
-    foreach (language_list('language') as $key => $object) {
-      $language_options[$key] = $object->name;
+    foreach (language_list('language') as $key => $entity) {
+      $language_options[$key] = $entity->name;
     }
     if (count($language_options) > 1) {
       $form['advanced']['language'] = array(
@@ -3489,8 +3489,8 @@ class NodeController extends DrupalDefaultEntityController {
     // Create an array of nodes for each content type and pass this to the
     // object type specific callback.
     $typed_nodes = array();
-    foreach ($nodes as $id => $object) {
-      $typed_nodes[$object->type][$id] = $object;
+    foreach ($nodes as $id => $entity) {
+      $typed_nodes[$entity->type][$id] = $entity;
     }
 
     // Call object type specific callbacks on each typed array of nodes.
-- 
cgit v1.2.3