Index: excerpt.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/excerpt/excerpt.module,v
retrieving revision 1.15
diff -u -r1.15 excerpt.module
--- excerpt.module	17 Oct 2009 23:12:18 -0000	1.15
+++ excerpt.module	25 Apr 2010 15:14:14 -0000
@@ -31,7 +31,7 @@
         $excerpt = db_fetch_object(db_query("SELECT * FROM {excerpt} WHERE nid = %d AND vid = %d", $node->nid, $node->vid));
         return array(
           'excerpt' => (bool)strcmp($node->teaser, $node->body),
-          'teaser_format' => $excerpt->format,
+          'teaser_format' => ($excerpt?$excerpt->format:NULL),
         );
 
       case 'delete revision':
@@ -50,6 +50,7 @@
           $primary_keys = array('vid');
         }
       case 'insert':
+        if (!isset($primary_keys)) $primary_keys = array();
         $excerpt = array();
         $excerpt['vid'] = $node->vid;
         $excerpt['nid'] = $node->nid;
@@ -99,12 +100,12 @@
     $form['teaser_field']['teaser'] = array(
       '#type' => 'textarea',
       '#title' => t('Teaser'),
-      '#default_value' => $form['#node']->teaser,
+      '#default_value' => (empty($form['#node']->teaser)?NULL:$form['#node']->teaser),
       '#cols' => 60,
       '#rows' => $form['body_field']['body']['#rows'],
       '#description' => t('Enter an excerpt for this item. It will be shown on listing pages along with a <em>read more</em> link which leads to the full view. Leave empty to auto-generate one from the body.'),
     );
-    $form['teaser_field']['format'] = filter_form($form['#node']->teaser_format, 1, array('teaser_format'));
+    $form['teaser_field']['format'] = filter_form((isset($form['#node']->teaser_format)?$form['#node']->teaser_format:$form['#node']->format), 1, array('teaser_format'));
 
     $form['body_field']['body']['#default_value'] = $form['#node']->body;