--- flickrfield.module	Sun Apr 25 15:22:31 2010
+++ flickrfield.module	Sun Apr 25 15:23:25 2010
@@ -203,14 +203,31 @@
 }
 
 function theme_flickrfield_photoset($img, $photo_url, $formatter, $photo_data, $node) {
-  $title = is_array($photo_data['title']) ? $photo_data['title']['_content'] : $photo_data['title'];
-  if (arg(0) == 'node' && arg(1) == $node->nid) {
-    $output = '<div class="flickr-photoset-img">'. $img .'</div>';
-  }
-  else {
-    $output = '<div class="flickr-photoset-img">'. l($img, 'node/'. $node->nid, array('attributes' => array('title' => $title), 'absolute' => TRUE, 'html' => TRUE)) . '</div>';
+  $output = '<div class="flickr-photoset">';
+  if (module_exists('flickr_sets')) {
+        $photos = flickr_set_load($photo_data['id']);
+        foreach ((array) $photos['photoset']['photo'] as $photo) {
+          //insert owner into $photo because theme_flickr_photo needs it
+          $photo['owner'] = $photos['photoset']['owner'];
+          $title = is_array($photo['title']) ? $photo['title']['_content'] : $photo['title'];
+	  $img = flickr_img($photo, $formatter);
+          if (arg(0) == 'node' && arg(1) == $node->nid) {
+            $output .= '<div class="flickr-photoset-img">'. $img .'</div>';
+          } else {
+            $output .= '<div class="flickr-photoset-img">'. l($img, 'node/'. $node->nid, array('attributes' => array('title' => $title), 'absolute' => TRUE, 'html' => TRUE)) . '</div>';
+          }
+        }
+  } else {
+    $title = is_array($photo_data['title']) ? $photo_data['title']['_content'] : $photo_data['title'];
+    if (arg(0) == 'node' && arg(1) == $node->nid) {
+      $output .= '<div class="flickr-photoset-img">'. $img .'</div>';
+    } else {
+      $output .= '<div class="flickr-photoset-img">'. l($img, 'node/'. $node->nid, array('attributes' => array('title' => $title), 'absolute' => TRUE, 'html' => TRUE)) . '</div>';
+    }
   }
+  $output .= '<div class="flickr-photoset-description">'. $photo_data['description']['_content'] .'</div>';
   $output .= '<div class="flickr-citation"><cite>'. l(t('Source: Flickr'), $photo_url) .'</cite></div>';
+  $output .= '</div>';
   return $output;
 }