Index: skeleton_instance.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/skeleton/skeleton_instance.inc,v
retrieving revision 1.11
diff -u -r1.11 skeleton_instance.inc
--- skeleton_instance.inc	11 Jan 2009 23:05:34 -0000	1.11
+++ skeleton_instance.inc	27 Jan 2009 18:47:52 -0000
@@ -674,12 +674,15 @@
 
       // Replace custom tokens in the title and body fields. Replace skeleton
       // tokens first so they may be used as node tokens such as [title].
-      $node['values']['title'] = token_replace($node['values']['title'], 'skeleton', $form_state['values']['skeleton_tokens']);
-      $node['values']['title'] = token_replace($node['values']['title'], 'node', (object)$form_state['values']);
+      if (!empty($form_state['values']['skeleton_tokens'])) {
+        $node['values']['title'] = token_replace($node['values']['title'], 'skeleton', $form_state['values']['skeleton_tokens']);
+        $node['values']['body'] = token_replace($node['values']['body'], 'skeleton', $form_state['values']['skeleton_tokens']);
+      }
+
+      $node['values']['title'] = token_replace($node['values']['title'], 'node', (object)$node['values']);
       $form_state['values']['title'] = $node['values']['title'];
 
-      $node['values']['body'] = token_replace($node['values']['body'], 'skeleton', $form_state['values']['skeleton_tokens']);
-      $node['values']['body'] = token_replace($node['values']['body'], 'node', (object)$form_state['values']);
+      $node['values']['body'] = token_replace($node['values']['body'], 'node', (object)$node['values']);
       $form_state['values']['body'] = $node['values']['body'];
 
       $form_state['values']['language'] = $node['values']['language'];
@@ -725,10 +728,13 @@
 
       // Replace custom tokens in the title and body fields. Replace skeleton
       // tokens first so they may be used as node tokens such as [title].
-      $node['values']['title'] = token_replace($node['values']['title'], 'skeleton', $form_state['values']['skeleton_tokens']);
-      $node['values']['title'] = token_replace($node['values']['title'], 'node', (object)$form_state['values']);
-      $node['values']['body'] = token_replace($node['values']['body'], 'skeleton', $form_state['values']['skeleton_tokens']);
-      $node['values']['body'] = token_replace($node['values']['body'], 'node', (object)$form_state['values']);
+      if (!empty($form_state['values']['skeleton_tokens'])) {
+        $node['values']['title'] = token_replace($node['values']['title'], 'skeleton', $form_state['values']['skeleton_tokens']);
+        $node['values']['body'] = token_replace($node['values']['body'], 'skeleton', $form_state['values']['skeleton_tokens']);
+      }
+
+      $node['values']['title'] = token_replace($node['values']['title'], 'node', (object)$node['values']);
+      $node['values']['body'] = token_replace($node['values']['body'], 'node', (object)$node['values']);
 
       $node['values']['op'] = t('Save');
       drupal_execute($node['values']['type'] .'_node_form', $node, (object)$node['values']);