diff options
Diffstat (limited to 'modules/node')
| -rw-r--r-- | modules/node/node.install | 2 | ||||
| -rw-r--r-- | modules/node/node.module | 8 |
2 files changed, 5 insertions, 5 deletions
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. |