--- slideshow.module.orig	2006-12-25 10:57:06.000000000 -0700
+++ slideshow.module	2009-03-23 11:07:03.000000000 -0600
@@ -21,6 +21,7 @@ define('SLIDESHOW_ALIGN_FULL', 1);
 define('SLIDESHOW_ALIGN_LEFT', 2);
 define('SLIDESHOW_ALIGN_RIGHT', 3);
 
+define('SLIDESHOW_SUPPRESS_ON_TEASER', TRUE);
 
 /**
  * Implementation of hook_menu().
@@ -132,6 +133,13 @@ function slideshow_admin_settings() {
     '#description' => t('Subdirectory in the global file directory where resized images for slideshows will be stored.'),
   );
 
+  $form['slideshow_suppress_on_teaser'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Suppress slideshow display on teasers'),
+    '#default_value' => variable_get('slideshow_suppress_on_teaser', SLIDESHOW_SUPPRESS_ON_TEASER),
+    '#description' => t('Check this box to suppress slideshow display on teasers.'),
+  );
+
   return system_settings_form($form);
 }
 
@@ -429,15 +437,18 @@ function slideshow_create_image($source,
  *
  * @param $node The node the slideshow should be displayed for.
  */
-function slideshow_view(&$node) {
+function slideshow_view(&$node, $teaser) {
   $location = $node->slideshow['location'];
   if ($location == SLIDESHOW_LOCATION_DEFAULT) {
     $location = variable_get('slideshow_default_location', SLIDESHOW_LOCATION_ABOVE);
   }
 
   // If there are no files or the slideshow is set to hidden, don't continue processing
-  if (empty($node->files) || $location == SLIDESHOW_LOCATION_NONE) return;
-
+  if (empty($node->files) || $location == SLIDESHOW_LOCATION_NONE 
+      || ($teaser && variable_get('slideshow_suppress_on_teaser', SLIDESHOW_SUPPRESS_ON_TEASER))) {
+    return;
+  }
+  
   $images = array();
   $files = array();