Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.669
diff -u -F^f -r1.669 node.module
--- modules/node/node.module	10 Aug 2006 15:42:33 -0000	1.669
+++ modules/node/node.module	12 Aug 2006 15:17:13 -0000
@@ -1828,6 +1828,9 @@ function node_object_prepare(&$node) {
  */
 function node_form($node) {
   $node = (object)$node;
+  $types = node_get_types();
+  $title = isset($node->nid) ? 'Edit %name' : 'Submit %name';
+  drupal_set_title(t($title, array('%name' => check_plain($types[$node->type]->name))));
   $form = node_form_array($node);
   return drupal_get_form($node->type .'_node_form', $form, 'node_form');
 }
@@ -1979,9 +1982,7 @@ function node_add($type) {
   if (isset($types[$type]) && node_access('create', $type)) {
     // Initialize settings:
     $node = array('uid' => $user->uid, 'name' => $user->name, 'type' => $type);
-
     $output = node_form($node);
-    drupal_set_title(t('Submit %name', array('%name' => check_plain($types[$type]->name))));
   }
   else {
     // If no (valid) node type has been provided, display a node type overview.