Index: nodeformsettings.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/nodeformsettings/nodeformsettings.module,v
retrieving revision 1.1.2.12
diff -u -p -r1.1.2.12 nodeformsettings.module
--- nodeformsettings.module	2 Mar 2010 20:17:36 -0000	1.1.2.12
+++ nodeformsettings.module	4 Jan 2011 08:28:54 -0000
@@ -238,25 +238,29 @@ function nodeformsettings_form_alter(&$f
 	if(isset($form['type']) && isset($form['#node']) && $form['type']['#value'] . '_node_form' == $form_id) {
 		$node = $form['#node'];
 		
-		// Change the default height of the body field
-    if(1 == variable_get('submission_body_rows_'. $node->type, '') && $form['body_field']['body']) {
-      $form['body_field']['body']['#type'] = 'textfield';
-    }
-    else if(variable_get('submission_body_rows_'. $node->type, '') && $form['body_field']['body']) {
-      $form['body_field']['body']['#rows'] = variable_get('submission_body_rows_'. $node->type, '');
-    }
+    // Only proceed if the body_field element exists, e.g. if the body label
+    // is empty or another module has renamed it.
+		if (isset($form['body_field'])) {
+  		// Change the default height of the body field
+      if(1 == variable_get('submission_body_rows_'. $node->type, '') && $form['body_field']['body']) {
+        $form['body_field']['body']['#type'] = 'textfield';
+      }
+      else if(variable_get('submission_body_rows_'. $node->type, '') && $form['body_field']['body']) {
+        $form['body_field']['body']['#rows'] = variable_get('submission_body_rows_'. $node->type, '');
+      }
     
-		// Node settings
-		// Hide the 'Split Summary at Cursor' button
-		if(variable_get('nodeformsettings_splitsummary_'. $node->type, '') == 1) {
-			$form['body_field']['teaser_include'] = array(
-				'#type' => 'value',
-				'#value' => TRUE,
-			);
-		}
-		// Hide the Input Format Fieldset
-		if(variable_get('nodeformsettings_inputformat_'. $node->type, '') == 1) {
-			unset($form['body_field']['format']);
+  		// Node settings
+  		// Hide the 'Split Summary at Cursor' button
+  		if(variable_get('nodeformsettings_splitsummary_'. $node->type, '') == 1) {
+  			$form['body_field']['teaser_include'] = array(
+  				'#type' => 'value',
+  				'#value' => TRUE,
+  			);
+  		}
+  		// Hide the Input Format Fieldset
+  		if(variable_get('nodeformsettings_inputformat_'. $node->type, '') == 1) {
+  			unset($form['body_field']['format']);
+  		}
 		}
 		
 	  // Hide the Revision log message field